MarginWidget: Moved in create_popup

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

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 34b2699bd6722fe9b5f3b169266f3341eb3eabad..894f023bf11c4d547db8649398905a8e57c8abe8 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -40,7 +40,6 @@ namespace pv {
 namespace view {
 
 const int TimeMarker::ArrowSize = 4;
-const int TimeMarker::Offset = 1;
 
 TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
        TimeItem(view),
@@ -57,16 +56,6 @@ double TimeMarker::time() const
        return time_;
 }
 
-float TimeMarker::get_x() const
-{
-       return (time_ - view_.offset()) / view_.scale();
-}
-
-QPoint TimeMarker::point() const
-{
-       return QPoint(get_x(), 0);
-}
-
 void TimeMarker::set_time(double time)
 {
        time_ = time;
@@ -77,43 +66,40 @@ void TimeMarker::set_time(double time)
                updating_value_widget_ = false;
        }
 
-       time_changed();
+       view_.time_item_appearance_changed(true, true);
 }
 
-void TimeMarker::paint(QPainter &p, const QRect &rect)
+float TimeMarker::get_x() const
 {
-       const float x = get_x();
-       p.setPen(colour_.darker());
-       p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
+       return (time_ - view_.offset()) / view_.scale();
 }
 
-QRectF TimeMarker::get_label_rect(const QRect &rect) const
+QPoint TimeMarker::point(const QRect &rect) const
 {
-       const float x = (time_ - view_.offset()) / view_.scale();
+       return QPoint(get_x(), rect.bottom());
+}
 
+QRectF TimeMarker::label_rect(const QRectF &rect) const
+{
        QFontMetrics m(QApplication::font());
-       const float text_width =
-               max(m.boundingRect(get_text()).size().width(), ArrowSize);
-       const float text_height = m.boundingRect("Tg").size().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::Offset - TimeMarker::ArrowSize - 0.5f;
-       const float height = label_size.height();
+               TimeMarker::ArrowSize - 0.5f;
+       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)
+void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
        if (!enabled())
                return;
 
        const qreal x = (time_ - view_.offset()) / view_.scale();
-       const QRectF r(get_label_rect(rect));
+       const QRectF r(label_rect(rect));
 
        const QPointF points[] = {
                r.topLeft(),
@@ -143,7 +129,7 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect)
        }
 
        p.setPen(Qt::transparent);
-       p.setBrush(colour_);
+       p.setBrush(hover ? colour_.lighter() : colour_);
        p.drawPolygon(points, countof(points));
 
        p.setPen(colour_.lighter());
@@ -158,11 +144,24 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect)
        p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
 }
 
+void TimeMarker::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+{
+       if (!enabled())
+               return;
+
+       const float x = get_x();
+       p.setPen(colour_.darker());
+       p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom()));
+}
+
 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);
 
@@ -183,10 +182,8 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 
 void TimeMarker::on_value_changed(double value)
 {
-       if (!updating_value_widget_) {
-               time_ = value;
-               time_changed();
-       }
+       if (!updating_value_widget_)
+               set_time(value);
 }
 
 } // namespace view