X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=8432a24b47cfba4fb8ce692ff075925161d7912f;hb=d4e39570ee6021766c375654801dddba45b9198a;hp=48109db8f92c9bac2e97240a37d7629d42b51b18;hpb=3b9c4a0df39e718ba69f3c778b51676617aeb1eb;p=pulseview.git

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 48109db8..8432a24b 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -65,6 +65,11 @@ void CursorPair::set_time(double time) {
 	second_->set_time(time + delta);
 }
 
+float CursorPair::get_x() const
+{
+	return (first_->get_x() + second_->get_x()) / 2.0f;
+}
+
 QPoint CursorPair::point() const
 {
 	return first_->point();
@@ -96,11 +101,14 @@ QRectF CursorPair::label_rect(const QRectF &rect) const
 		right - left, height);
 }
 
-void CursorPair::draw_markers(QPainter &p, const QRect &rect)
+void CursorPair::paint_label(QPainter &p, const QRect &rect)
 {
 	assert(first_);
 	assert(second_);
 
+	if (!enabled())
+		return;
+
 	const unsigned int prefix = view_.tick_prefix();
 
 	compute_text_size(p, prefix);
@@ -113,6 +121,12 @@ void CursorPair::draw_markers(QPainter &p, const QRect &rect)
 	{
 		const int highlight_radius = delta_rect.height() / 2 - 2;
 
+		if (selected()) {
+			p.setBrush(Qt::transparent);
+			p.setPen(highlight_pen());
+			p.drawRoundedRect(delta_rect, radius, radius);
+		}
+
 		p.setBrush(Cursor::FillColour);
 		p.setPen(Cursor::FillColour.darker());
 		p.drawRoundedRect(delta_rect, radius, radius);
@@ -121,15 +135,11 @@ void CursorPair::draw_markers(QPainter &p, const QRect &rect)
 		p.setPen(Cursor::FillColour.lighter());
 		p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
 
-		p.setPen(SelectableItem::select_text_colour(
+		p.setPen(ViewItem::select_text_colour(
 			Cursor::FillColour));
 		p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
 			pv::util::format_time(second_->time() - first_->time(), prefix, 2));
 	}
-
-	// Paint the cursor markers
-	first_->paint_label(p, rect);
-	second_->paint_label(p, rect);
 }
 
 void CursorPair::draw_viewport_background(QPainter &p,