ViewItem: Moved in paint_fore, paint_mid and paint_back

[pulseview.git] / pv / view / cursorpair.cpp

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index f9f7ba21ea93faa865653914086e2b4718d3b23b..8432a24b47cfba4fb8ce692ff075925161d7912f 100644 (file)
--- 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);
@@ -126,15 +135,11 @@ void CursorPair::draw_markers(QPainter &p, const QRect &rect)
                p.setPen(Cursor::FillColour.lighter());
                p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
 
-               p.setPen(SelectableItem::select_text_colour(
+               p.setPen(ViewItem::select_text_colour(
                        Cursor::FillColour));
                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,