X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=47ba34559a1dd15fa45fc2ff4d979d6a23f17dab;hp=ed9df36064f74407b1a1ee81f80d11378adbc81c;hb=ec39632d1267a42cb858ac6ad7c98486886a46a0;hpb=98cfe4e8dadad2cf710eb46fd5c85d9d0520a875 diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp index ed9df360..47ba3455 100644 --- 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), @@ -87,20 +86,20 @@ 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 float text_height = m.height(); const QSizeF label_size( - text_width + View::LabelPadding.width() * 2, - text_height + View::LabelPadding.height() * 2); + text_width + LabelPadding.width() * 2, + text_height + LabelPadding.height() * 2); const float top = rect.height() - label_size.height() - - TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f; + TimeMarker::ArrowSize - 0.5f; const float height = label_size.height(); return QRectF(x - label_size.width() / 2, top, label_size.width(), height); } -void TimeMarker::paint_label(QPainter &p, const QRect &rect) +void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover) { if (!enabled()) return; @@ -136,7 +135,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());