ViewItem: Moved in paint_label

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

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index f9f7ba21ea93faa865653914086e2b4718d3b23b..a14f458bedd96710304cb06ad262944e5a91278d 100644 (file)
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -101,13 +101,19 @@ 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, bool hover)
 {
        assert(first_);
        assert(second_);
 
+       if (!enabled())
+               return;
+
        const unsigned int prefix = view_.tick_prefix();
+       const QColor text_colour =
+               ViewItem::select_text_colour(Cursor::FillColour);
 
+       p.setPen(text_colour);
        compute_text_size(p, prefix);
        QRectF delta_rect(label_rect(rect));
 
@@ -118,7 +124,14 @@ void CursorPair::draw_markers(QPainter &p, const QRect &rect)
        {
                const int highlight_radius = delta_rect.height() / 2 - 2;
 
-               p.setBrush(Cursor::FillColour);
+               if (selected()) {
+                       p.setBrush(Qt::transparent);
+                       p.setPen(highlight_pen());
+                       p.drawRoundedRect(delta_rect, radius, radius);
+               }
+
+               p.setBrush(hover ? Cursor::FillColour.lighter() :
+                       Cursor::FillColour);
                p.setPen(Cursor::FillColour.darker());
                p.drawRoundedRect(delta_rect, radius, radius);
 
@@ -126,20 +139,16 @@ 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(
-                       Cursor::FillColour));
+               p.setPen(text_colour);
                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,
-       const QRect &rect)
-{
+void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
+       if (!enabled())
+               return;
+
        p.setPen(Qt::NoPen);
        p.setBrush(QBrush(View::CursorAreaColour));
 
@@ -147,19 +156,9 @@ void CursorPair::draw_viewport_background(QPainter &p,
        const int l = (int)max(min(
                offsets.first, offsets.second), 0.0f);
        const int r = (int)min(max(
-               offsets.first, offsets.second), (float)rect.width());
-
-       p.drawRect(l, 0, r - l, rect.height());
-}
-
-void CursorPair::draw_viewport_foreground(QPainter &p,
-       const QRect &rect)
-{
-       assert(first_);
-       assert(second_);
+               offsets.first, offsets.second), (float)pp.width());
 
-       first_->paint(p, rect);
-       second_->paint(p, rect);
+       p.drawRect(l, pp.top(), r - l, pp.height());
 }
 
 void CursorPair::compute_text_size(QPainter &p, unsigned int prefix)