X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=ea60b6ce1191415f6c6ef449c19846e4145193f3;hp=c5a1bc9923beafb00c805eff8f331735a764bbdf;hb=5a6a4ce3e32a250cd586f4755573ed3bed530d7b;hpb=f106fc3a2d824745744d5c96039966434d56af64

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index c5a1bc99..ea60b6ce 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -36,6 +36,7 @@ namespace pv {
 namespace view {
 
 const int CursorPair::DeltaPadding = 8;
+const QColor CursorPair::ViewportFillColour(220, 231, 243);
 
 CursorPair::CursorPair(View &view) :
 	TimeItem(view),
@@ -70,9 +71,9 @@ float CursorPair::get_x() const
 	return (first_->get_x() + second_->get_x()) / 2.0f;
 }
 
-QPoint CursorPair::point() const
+QPoint CursorPair::point(const QRect &rect) const
 {
-	return first_->point();
+	return first_->point(rect);
 }
 
 pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
@@ -83,9 +84,7 @@ pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
 
 QRectF CursorPair::label_rect(const QRectF &rect) const
 {
-	const QSizeF label_size(
-		text_size_.width() + View::LabelPadding.width() * 2,
-		text_size_.height() + View::LabelPadding.height() * 2);
+	const QSizeF label_size(text_size_ + LabelPadding * 2);
 	const pair<float, float> offsets(get_cursor_offsets());
 	const pair<float, float> normal_offsets(
 		(offsets.first < offsets.second) ? offsets :
@@ -97,11 +96,11 @@ QRectF CursorPair::label_rect(const QRectF &rect) const
 		(float)rect.width() + height);
 
 	return QRectF(left, rect.height() - label_size.height() -
-		TimeMarker::ArrowSize - TimeMarker::Offset - 0.5f,
+		TimeMarker::ArrowSize - 0.5f,
 		right - left, height);
 }
 
-void CursorPair::paint_label(QPainter &p, const QRect &rect)
+void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	assert(first_);
 	assert(second_);
@@ -130,7 +129,8 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect)
 			p.drawRoundedRect(delta_rect, radius, radius);
 		}
 
-		p.setBrush(Cursor::FillColour);
+		p.setBrush(hover ? Cursor::FillColour.lighter() :
+			Cursor::FillColour);
 		p.setPen(Cursor::FillColour.darker());
 		p.drawRoundedRect(delta_rect, radius, radius);
 
@@ -149,7 +149,7 @@ void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
 		return;
 
 	p.setPen(Qt::NoPen);
-	p.setBrush(QBrush(View::CursorAreaColour));
+	p.setBrush(QBrush(ViewportFillColour));
 
 	const pair<float, float> offsets(get_cursor_offsets());
 	const int l = (int)max(min(