X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=729b0b4c1588ff6ae93cc5c152dbdcd2e46994cc;hb=e71eb81c946c3524e01eaef9781ccbf170143d0c;hp=bf1c4ae511f4f507726e97ab2f726b7b95fb6dc0;hpb=786b76785856c6cf8f5916c0b8d76a61695762f9;p=pulseview.git diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index bf1c4ae5..729b0b4c 100644 --- a/pv/view/trace.cpp +++ b/pv/view/trace.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include @@ -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) { } @@ -163,6 +163,13 @@ QRectF Trace::label_rect(const QRectF &rect) const label_size.height()); } +QRectF Trace::hit_box_rect(const QRectF &rect) const +{ + const float h = QFontMetrics(QApplication::font()).height(); + return QRectF(rect.left(), get_visual_y() - h / 2.0f, + rect.width(), h); +} + void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y) { p.setPen(AxisPen); @@ -212,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)