X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=125d3c2430ba868d95c0f535e162d9279dda9e90;hp=2f02e7744782e330107c2484bd116536d0e7f506;hb=2e57535108a0ae2e5d1ee454f1e61b71d23afdb3;hpb=a2f71ef0465ce94c6a1006adf520ba76605b457e

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 2f02e774..125d3c24 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -64,18 +64,17 @@ void Header::paintEvent(QPaintEvent *event)
 	QPainter painter(this);
 	painter.setRenderHint(QPainter::Antialiasing);
 
-	int offset = -_view.v_offset();
+	const int v_offset = _view.v_offset();
 	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
 	{
 		assert(s);
 
 		const QRect signal_heading_rect(
-			0, offset, w, View::SignalHeight);
+			0, s->get_v_offset() - v_offset,
+			w, View::SignalHeight);
 
 		s->paint_label(painter, signal_heading_rect,
 			s->pt_in_label_rect(signal_heading_rect, _mouse_point));
-
-		offset += View::SignalHeight;
 	}
 
 	painter.end();
@@ -100,13 +99,14 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 	const vector< shared_ptr<Signal> > &sigs =
 		_view.session().get_signals();
 
-	int offset = -_view.v_offset();
+	const int v_offset = _view.v_offset();
 	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
 	{
 		assert(s);
 
 		const QRect signal_heading_rect(
-			0, offset, w, View::SignalHeight);
+			0, s->get_v_offset() - v_offset,
+			w, View::SignalHeight);
 
 		if(s->pt_in_label_rect(signal_heading_rect, _mouse_point)) {
 			QMenu menu(this);
@@ -119,8 +119,6 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 
 			break;
 		}
-
-		offset += View::SignalHeight;
 	}
 }