MarginWidget: Moved in create_popup

[pulseview.git] / pv / view / timemarker.cpp

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 2b17184408a4ba8a5fb5f44f03320d832afdca8f..894f023bf11c4d547db8649398905a8e57c8abe8 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -74,29 +74,23 @@ 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 = (time_ - view_.offset()) / view_.scale();
 
-       return QRectF(x - label_size.width() / 2, top,
-               label_size.width(), height);
+       return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
 }
 
 void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
@@ -165,6 +159,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);