X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=ecce13893def06fb3e4c3f8559d412ef8d2fa5cc;hb=f4433aa958fb9c85ce82ef5545d722625cb64f9e;hp=f9f7ba21ea93faa865653914086e2b4718d3b23b;hpb=5165bb349b14802ca98766b4cecee3699d22fa55;p=pulseview.git diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp index f9f7ba21..ecce1389 100644 --- a/pv/view/cursorpair.cpp +++ b/pv/view/cursorpair.cpp @@ -101,11 +101,14 @@ QRectF CursorPair::label_rect(const QRectF &rect) const right - left, height); } -void CursorPair::draw_markers(QPainter &p, const QRect &rect) +void CursorPair::paint_label(QPainter &p, const QRect &rect) { assert(first_); assert(second_); + if (!enabled()) + return; + const unsigned int prefix = view_.tick_prefix(); compute_text_size(p, prefix); @@ -118,6 +121,12 @@ void CursorPair::draw_markers(QPainter &p, const QRect &rect) { const int highlight_radius = delta_rect.height() / 2 - 2; + if (selected()) { + p.setBrush(Qt::transparent); + p.setPen(highlight_pen()); + p.drawRoundedRect(delta_rect, radius, radius); + } + p.setBrush(Cursor::FillColour); p.setPen(Cursor::FillColour.darker()); p.drawRoundedRect(delta_rect, radius, radius); @@ -131,10 +140,6 @@ void CursorPair::draw_markers(QPainter &p, const QRect &rect) p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter, pv::util::format_time(second_->time() - first_->time(), prefix, 2)); } - - // Paint the cursor markers - first_->paint_label(p, rect); - second_->paint_label(p, rect); } void CursorPair::draw_viewport_background(QPainter &p,