X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=0370793d0407b9a9d8db11dc55e592f50ef53732;hp=0b5363f18134b96b622e6e9e269289f0cde67218;hb=5c5ce7574062e0d3ad4f7d9dde70b482315d54fb;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 0b5363f1..0370793d 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "cursorpair.h"
+#include "cursorpair.hpp"
 
-#include "view.h"
-#include "pv/util.h"
+#include "view.hpp"
+#include "pv/util.hpp"
 
 #include <cassert>
 #include <algorithm>
@@ -38,12 +38,17 @@ namespace view {
 const int CursorPair::DeltaPadding = 8;
 
 CursorPair::CursorPair(View &view) :
+	TimeItem(view),
 	first_(new Cursor(view, 0.0)),
-	second_(new Cursor(view, 1.0)),
-	view_(view)
+	second_(new Cursor(view, 1.0))
 {
 }
 
+bool CursorPair::enabled() const
+{
+	return view_.cursors_shown();
+}
+
 shared_ptr<Cursor> CursorPair::first() const
 {
 	return first_;
@@ -54,6 +59,17 @@ shared_ptr<Cursor> CursorPair::second() const
 	return second_;
 }
 
+QPoint CursorPair::point() const
+{
+	return first_->point();
+}
+
+pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
+{
+	(void)parent;
+	return nullptr;
+}
+
 QRectF CursorPair::get_label_rect(const QRect &rect) const
 {
 	const QSizeF label_size(
@@ -70,16 +86,17 @@ QRectF CursorPair::get_label_rect(const QRect &rect) const
 		(float)rect.width() + height);
 
 	return QRectF(left, rect.height() - label_size.height() -
-		Cursor::ArrowSize - Cursor::Offset - 0.5f,
+		TimeMarker::ArrowSize - TimeMarker::Offset - 0.5f,
 		right - left, height);
 }
 
-void CursorPair::draw_markers(QPainter &p,
-	const QRect &rect, unsigned int prefix)
+void CursorPair::draw_markers(QPainter &p, const QRect &rect)
 {
 	assert(first_);
 	assert(second_);
 
+	const unsigned int prefix = view_.tick_prefix();
+
 	compute_text_size(p, prefix);
 	QRectF delta_rect(get_label_rect(rect));
 
@@ -91,21 +108,22 @@ void CursorPair::draw_markers(QPainter &p,
 		const int highlight_radius = delta_rect.height() / 2 - 2;
 
 		p.setBrush(Cursor::FillColour);
-		p.setPen(Cursor::LineColour);
+		p.setPen(Cursor::FillColour.darker());
 		p.drawRoundedRect(delta_rect, radius, radius);
 
 		delta_rect.adjust(1, 1, -1, -1);
-		p.setPen(Cursor::HighlightColour);
+		p.setPen(Cursor::FillColour.lighter());
 		p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
 
-		p.setPen(Cursor::TextColour);
+		p.setPen(SelectableItem::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, prefix);
-	second_->paint_label(p, rect, prefix);
+	first_->paint_label(p, rect);
+	second_->paint_label(p, rect);
 }
 
 void CursorPair::draw_viewport_background(QPainter &p,