From ccee92304f20d354ad4959f361d3d26eb5ea6270 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sat, 20 Dec 2014 15:53:58 +0000 Subject: [PATCH] CursorPair: Moved in ViewportFillColour --- pv/view/cursorpair.cpp | 3 ++- pv/view/cursorpair.hpp | 1 + pv/view/view.cpp | 2 -- pv/view/view.hpp | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp index 00871107..0395d034 100644 --- 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 offsets(get_cursor_offsets()); const int l = (int)max(min( diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp index fc9f0d1b..7e089083 100644 --- 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 9cc1487e..59127c36 100644 --- 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 344e252e..167f43de 100644 --- 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: -- 2.30.2