X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;fp=pv%2Fview%2Ftimemarker.cpp;h=614275cf98e04d1d559d211cae6bf9740f595b15;hp=47ba34559a1dd15fa45fc2ff4d979d6a23f17dab;hb=8b855030926f6c271b650392d34444fd917ec764;hpb=ec39632d1267a42cb858ac6ad7c98486886a46a0 diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp index 47ba3455..614275cf 100644 --- a/pv/view/timemarker.cpp +++ b/pv/view/timemarker.cpp @@ -81,22 +81,16 @@ QPoint TimeMarker::point() const 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 + LabelPadding.width() * 2, - text_height + 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)