Moved highlight pen into SelectableItem

diff --git a/pv/view/selectableitem.cpp b/pv/view/selectableitem.cpp
index 517b6879120c2b71f34670df4a23b1caa154cae0..8dfdd8aa33d36c9c200486cb6ff317da13500989 100644 (file)
--- a/pv/view/selectableitem.cpp
+++ b/pv/view/selectableitem.cpp
@@ -20,9 +20,14 @@
 
 #include "selectableitem.h"
 
+#include <QApplication>
+#include <QPalette>
+
 namespace pv {
 namespace view {
 
+const int SelectableItem::HighlightRadius = 6;
+
 SelectableItem::SelectableItem() :
        _selected(false)
 {
@@ -38,5 +43,12 @@ void SelectableItem::select(bool select)
        _selected = select;
 }
 
+QPen SelectableItem::highlight_pen()
+{
+       return QPen(QApplication::palette().brush(
+               QPalette::Highlight), HighlightRadius,
+               Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+}
+
 } // namespace view
 } // namespace pv

diff --git a/pv/view/selectableitem.h b/pv/view/selectableitem.h
index 69204b29478b901ec703ee858ab3ba457ad318ec..d8545ce6e78c2e412153335f1fe1cad28774ebcd 100644 (file)
--- a/pv/view/selectableitem.h
+++ b/pv/view/selectableitem.h
@@ -23,7 +23,7 @@
 
 #include <list>
 
-#include <QObject>
+#include <QPen>
 
 class QAction;
 
@@ -34,6 +34,9 @@ class SelectableItem : public QObject
 {
        Q_OBJECT
 
+private:
+       static const int HighlightRadius;
+
 public:
        SelectableItem();
 
@@ -48,6 +51,9 @@ public:
         */
        void select(bool select = true);
 
+protected:
+       static QPen highlight_pen();
+
 private:
        bool _selected;
 };

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index dd50243a7095c468f4a424ca0e46f9251919c1dc..ae180e19a47a228a35f8d1151658b3f1b14973c2 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -32,7 +32,6 @@ namespace pv {
 namespace view {
 
 const int Signal::LabelHitPadding = 2;
-const int Signal::LabelHighlightRadius = 6;
 
 const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
 
@@ -104,9 +103,7 @@ void Signal::paint_label(QPainter &p, int y, int right, bool hover)
        };
 
        if (selected()) {
-               p.setPen(QPen(QApplication::palette().brush(
-                       QPalette::Highlight), LabelHighlightRadius,
-                       Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+               p.setPen(highlight_pen());
                p.setBrush(Qt::transparent);
                p.drawPolygon(points, countof(points));
        }

diff --git a/pv/view/signal.h b/pv/view/signal.h
index 4f16e3a72b8bbb4f15cfdebd257b6ab0c6e3dd1d..ece2e5a446218591f066a435454004a550b267f3 100644 (file)
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -49,7 +49,6 @@ class Signal : public SelectableItem
 
 private:
        static const int LabelHitPadding;
-       static const int LabelHighlightRadius;
 
        static const QPen SignalAxisPen;