Cursor: Moved paint_label into TimeMarker

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

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 0b5363f18134b96b622e6e9e269289f0cde67218..12b7bc341160b90f391b2c8d3df3056e3696a67f 100644 (file)
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "cursorpair.h"
+#include "cursorpair.hpp"
 
-#include "view.h"
-#include "pv/util.h"
+#include "view.hpp"
+#include "pv/util.hpp"
 
 #include <cassert>
 #include <algorithm>
@@ -70,16 +70,17 @@ QRectF CursorPair::get_label_rect(const QRect &rect) const
                (float)rect.width() + height);
 
        return QRectF(left, rect.height() - label_size.height() -
-               Cursor::ArrowSize - Cursor::Offset - 0.5f,
+               TimeMarker::ArrowSize - TimeMarker::Offset - 0.5f,
                right - left, height);
 }
 
-void CursorPair::draw_markers(QPainter &p,
-       const QRect &rect, unsigned int prefix)
+void CursorPair::draw_markers(QPainter &p, const QRect &rect)
 {
        assert(first_);
        assert(second_);
 
+       const unsigned int prefix = view_.tick_prefix();
+
        compute_text_size(p, prefix);
        QRectF delta_rect(get_label_rect(rect));
 
@@ -91,21 +92,22 @@ void CursorPair::draw_markers(QPainter &p,
                const int highlight_radius = delta_rect.height() / 2 - 2;
 
                p.setBrush(Cursor::FillColour);
-               p.setPen(Cursor::LineColour);
+               p.setPen(Cursor::FillColour.darker());
                p.drawRoundedRect(delta_rect, radius, radius);
 
                delta_rect.adjust(1, 1, -1, -1);
-               p.setPen(Cursor::HighlightColour);
+               p.setPen(Cursor::FillColour.lighter());
                p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
 
-               p.setPen(Cursor::TextColour);
+               p.setPen(SelectableItem::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, prefix);
-       second_->paint_label(p, rect, prefix);
+       first_->paint_label(p, rect);
+       second_->paint_label(p, rect);
 }
 
 void CursorPair::draw_viewport_background(QPainter &p,