X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=48e47f27aa9a49304dddc6d1feef879463183cf4;hb=2bcba522a02affd1627d9decc23182626fadfe09;hp=ed414c7c510c13b60c0f6225bd93d69a443b16c2;hpb=3ef6182a4cb1d50262f019e5d78bd5c00fc08ca5;p=pulseview.git diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp index ed414c7c..48e47f27 100644 --- a/pv/view/signal.cpp +++ b/pv/view/signal.cpp @@ -20,6 +20,8 @@ #include +#include + #include #include "signal.h" @@ -134,6 +136,8 @@ void Signal::paint_label(QPainter &p, int y, int right, bool hover) bool Signal::pt_in_label_rect(int y, int left, int right, const QPoint &point) { + (void)left; + const QRectF label = get_label_rect(y, right); return QRectF( QPointF(label.left() - LabelHitPadding, @@ -150,7 +154,9 @@ void Signal::paint_axis(QPainter &p, int y, int left, int right) void Signal::compute_text_size(QPainter &p) { - _text_size = p.boundingRect(QRectF(), 0, _name).size(); + _text_size = QSize( + p.boundingRect(QRectF(), 0, _name).width(), + p.boundingRect(QRectF(), 0, "Tg").height()); } QRectF Signal::get_label_rect(int y, int right) @@ -159,7 +165,7 @@ QRectF Signal::get_label_rect(int y, int right) const QSizeF label_size( _text_size.width() + View::LabelPadding.width() * 2, - _text_size.height() + View::LabelPadding.height() * 2); + ceilf((_text_size.height() + View::LabelPadding.height() * 2) / 2) * 2); const float label_arrow_length = label_size.height() / 2; return QRectF( right - label_arrow_length - label_size.width() - 0.5,