X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=e4ef3c0e1cb5edff4a2765484ca93a3697431369;hb=818f617924d2ed393cadd362fdafbd9d4288848f;hp=894f023bf11c4d547db8649398905a8e57c8abe8;hpb=786b76785856c6cf8f5916c0b8d76a61695762f9;p=pulseview.git

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 894f023b..e4ef3c0e 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -45,8 +45,8 @@ TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
 	TimeItem(view),
 	colour_(colour),
 	time_(time),
-	value_action_(NULL),
-	value_widget_(NULL),
+	value_action_(nullptr),
+	value_widget_(nullptr),
 	updating_value_widget_(false)
 {
 }
@@ -88,11 +88,18 @@ QRectF TimeMarker::label_rect(const QRectF &rect) const
 	const QSizeF label_size(text_size + LabelPadding * 2);
 	const float top = rect.height() - label_size.height() -
 		TimeMarker::ArrowSize - 0.5f;
-	const float x = (time_ - view_.offset()) / view_.scale();
+	const float x = get_x();
 
 	return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
 }
 
+QRectF TimeMarker::hit_box_rect(const QRectF &rect) const
+{
+	const float x = get_x();
+	const float h = QFontMetrics(QApplication::font()).height();
+	return QRectF(x - h / 2.0f, rect.top(), h, rect.height());
+}
+
 void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	if (!enabled())