CursorPair: Moved in ViewportFillColour

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 00871107c38ccc2f3a6665c1d4356e14edafc8ac..0395d03446d03abb72d6b5e8a92917e8b1f73bcd 100644 (file)
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -36,6 +36,7 @@ namespace pv {
 namespace view {
 
 const int CursorPair::DeltaPadding = 8;
+const QColor CursorPair::ViewportFillColour(220, 231, 243);
 
 CursorPair::CursorPair(View &view) :
        TimeItem(view),
@@ -150,7 +151,7 @@ void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
                return;
 
        p.setPen(Qt::NoPen);
-       p.setBrush(QBrush(View::CursorAreaColour));
+       p.setBrush(QBrush(ViewportFillColour));
 
        const pair<float, float> offsets(get_cursor_offsets());
        const int l = (int)max(min(

diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp
index fc9f0d1ba6f4a4edc718e869bfe61dd381588641..7e089083f0d34ecb426c8b2de3977cc799a01934 100644 (file)
--- a/pv/view/cursorpair.hpp
+++ b/pv/view/cursorpair.hpp
@@ -36,6 +36,7 @@ class CursorPair : public TimeItem
 {
 private:
        static const int DeltaPadding;
+       static const QColor ViewportFillColour;
 
 public:
        /**

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 9cc1487e9dc30216c5e146d85c46ae48a44d291b..59127c364bb7f0bf35ed83e3de0a8398357d53d1 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -84,8 +84,6 @@ const int View::MaxScrollValue = INT_MAX / 2;
 
 const int View::ScaleUnits[3] = {1, 2, 5};
 
-const QColor View::CursorAreaColour(220, 231, 243);
-
 const QSizeF View::LabelPadding(4, 0);
 
 View::View(Session &session, QWidget *parent) :

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 344e252e7e9f8caa7a2a2e00c8cb4f2f2df74626..167f43de0b50f497bcd2191851669fb3825dad51 100644 (file)
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -68,8 +68,6 @@ private:
        static const int ScaleUnits[3];
 
 public:
-       static const QColor CursorAreaColour;
-
        static const QSizeF LabelPadding;
 
 public: