X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=1e5b8206e54165ebc3cc36e20181eef686c422ce;hp=2b17184408a4ba8a5fb5f44f03320d832afdca8f;hb=18ca62d26394f2ffe6e993ff02cd64958b2cee1b;hpb=6abffa979b89440af383cf1142648e34dcbdfc44

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 2b171844..1e5b8206 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -74,29 +74,30 @@ float TimeMarker::get_x() const
 	return (time_ - view_.offset()) / view_.scale();
 }
 
-QPoint TimeMarker::point() const
+QPoint TimeMarker::point(const QRect &rect) const
 {
-	return QPoint(get_x(), 0);
+	return QPoint(get_x(), rect.bottom());
 }
 
 QRectF TimeMarker::label_rect(const QRectF &rect) const
 {
-	const float x = (time_ - view_.offset()) / view_.scale();
-
 	QFontMetrics m(QApplication::font());
-	const float text_width =
-		max(m.boundingRect(get_text()).size().width(), ArrowSize);
-	const float text_height = m.height();
-
-	const QSizeF label_size(
-		text_width + View::LabelPadding.width() * 2,
-		text_height + View::LabelPadding.height() * 2);
+	const QSizeF text_size(
+		max(m.boundingRect(get_text()).size().width(), ArrowSize),
+		m.height());
+	const QSizeF label_size(text_size + LabelPadding * 2);
 	const float top = rect.height() - label_size.height() -
 		TimeMarker::ArrowSize - 0.5f;
-	const float height = label_size.height();
+	const float x = get_x();
+
+	return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
+}
 
-	return QRectF(x - label_size.width() / 2, top,
-		label_size.width(), height);
+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)
@@ -165,6 +166,9 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 	using pv::widgets::Popup;
 
 	Popup *const popup = new Popup(parent);
+	popup->set_position(parent->mapToGlobal(
+		point(parent->rect())), Popup::Bottom);
+
 	QFormLayout *const form = new QFormLayout(popup);
 	popup->setLayout(form);