X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=653cac483bc0d36ec37b4c57b01f168cf5f3f586;hb=1ef49ddd04f44a4369403fbab19ed235483e2975;hp=2e497761b18a761ca6dd4785252e7bfc96e0030a;hpb=512bfc565937c0c1b07ec0e6486831526a6e1eee;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 2e497761..653cac48 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -73,7 +73,7 @@ QSize Header::sizeHint() const
 		assert(t);
 
 		if (t->enabled()) {
-			max_width = max(max_width, (int)t->get_label_rect(0).width());
+			max_width = max(max_width, (int)t->label_rect(0).width());
 		}
 	}
 
@@ -82,13 +82,13 @@ QSize Header::sizeHint() const
 
 shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
 {
-	const int w = width();
+	const int w = width() - BaselineOffset;
 	const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
 	for (const shared_ptr<Trace> t : traces)
 	{
 		assert(t);
-		if (t->pt_in_label_rect(0, w, pt))
+		if (t->enabled() && t->label_rect(w).contains(pt))
 			return t;
 	}
 
@@ -122,8 +122,8 @@ void Header::paintEvent(QPaintEvent*)
 	{
 		assert(t);
 
-		const bool highlight = !dragging && t->pt_in_label_rect(
-			0, w, _mouse_point);
+		const bool highlight = !dragging &&
+			t->label_rect(w).contains(_mouse_point);
 		t->paint_label(painter, w, highlight);
 	}
 
@@ -143,7 +143,7 @@ void Header::mousePressEvent(QMouseEvent *event)
 		for (const shared_ptr<Trace> t : traces)
 			if (t->selected())
 				_drag_traces.push_back(
-					make_pair(t, t->get_v_offset()));
+					make_pair(t, t->v_offset()));
 	}
 
 	// Select the signal if it has been clicked
@@ -163,7 +163,7 @@ void Header::mousePressEvent(QMouseEvent *event)
 			if (event->button() & Qt::LeftButton)
 				_drag_traces.push_back(
 					make_pair(mouse_over_trace,
-					mouse_over_trace->get_v_offset()));
+					mouse_over_trace->v_offset()));
 		}
 	}