X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=93c7c5a93cdd3bae6af7db425b612e12618ab200;hb=4b018bf1eeed0f7b80120d41d7881673a2f29e61;hp=d9b4691b310e883816a4bfd373cf93644608708a;hpb=1e948182f3f9353bd74875a37cacc833312a8c8e;p=pulseview.git

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index d9b4691b..93c7c5a9 100644
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -161,7 +161,8 @@ DecodeTrace::DecodeTrace(pv::Session &session,
 
 	// Determine shortest string we want to see displayed in full
 	QFontMetrics m(QApplication::font());
-	min_useful_label_width_ = m.width("XX"); // e.g. two hex characters
+	// e.g. two hex characters
+	min_useful_label_width_ = util::text_width(m, "XX");
 
 	default_row_height_ = (ViewItemPaintParams::text_height() * 6) / 4;
 	annotation_height_ = (ViewItemPaintParams::text_height() * 5) / 4;
@@ -612,9 +613,12 @@ void DecodeTrace::hover_point_changed(const QPoint &hp)
 		r.expand_marker_highlighted = false;
 
 	if (hover_row) {
-		int row_y = get_row_y(hover_row);
+		const pair<int, int> extents = v_extents();
+		const int trace_top = get_visual_y() + extents.first;
+		const int trace_btm = get_visual_y() + extents.second;
+
 		if ((hp.x() > 0) && (hp.x() < (int)(ArrowSize + 3 + hover_row->title_width)) &&
-			(hp.y() > (int)(row_y - ArrowSize)) && (hp.y() < (int)(row_y + ArrowSize))) {
+			(hp.y() > trace_top) && (hp.y() < trace_btm)) {
 
 			hover_row->expand_marker_highlighted = true;
 			show_hidden_rows_ = true;