ViewItem: Make hit_box_rect take ViewItemPaintParams

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

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 24f97fb76da1c2f0052008354d801aef1bae2925..2e15ca958a1da81af2ebba507328da0b9cb801b6 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -21,7 +21,7 @@
 #include <extdef.h>
 
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include <QApplication>
 #include <QFormLayout>
@@ -43,8 +43,8 @@ const int Trace::LabelHitPadding = 2;
 
 Trace::Trace(QString name) :
        name_(name),
-       popup_(NULL),
-       popup_form_(NULL)
+       popup_(nullptr),
+       popup_form_(nullptr)
 {
 }
 
@@ -134,6 +134,8 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
        using pv::widgets::Popup;
 
        popup_ = new Popup(parent);
+       popup_->set_position(parent->mapToGlobal(
+               point(parent->rect())), Popup::Right);
 
        create_popup_form();
 
@@ -151,8 +153,8 @@ QRectF Trace::label_rect(const QRectF &rect) const
        const QSize text_size(
                m.boundingRect(QRect(), 0, name_).width(), m.height());
        const QSizeF label_size(
-               text_size.width() + View::LabelPadding.width() * 2,
-               ceilf((text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);
+               text_size.width() + LabelPadding.width() * 2,
+               ceilf((text_size.height() + LabelPadding.height() * 2) / 2) * 2);
        const float half_height = label_size.height() / 2;
        return QRectF(
                rect.right() - half_height - label_size.width() - 0.5,
@@ -161,6 +163,13 @@ QRectF Trace::label_rect(const QRectF &rect) const
                label_size.height());
 }
 
+QRectF Trace::hit_box_rect(const ViewItemPaintParams &pp) const
+{
+       const float h = QFontMetrics(QApplication::font()).height();
+       return QRectF(pp.left(), get_visual_y() - h / 2.0f,
+               pp.width(), h);
+}
+
 void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y)
 {
        p.setPen(AxisPen);
@@ -210,8 +219,8 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 void Trace::on_popup_closed()
 {
-       popup_ = NULL;
-       popup_form_ = NULL;
+       popup_ = nullptr;
+       popup_form_ = nullptr;
 }
 
 void Trace::on_text_changed(const QString &text)