Implement "fill logic signal high areas" feature

[pulseview.git] / pv / widgets / colorbutton.hpp

diff --git a/pv/widgets/colorbutton.hpp b/pv/widgets/colorbutton.hpp
index 37cd6e73f0dd9fbdc98bc0c8aa75add8c91dfe85..4726c1bb41bf566384298a3e13af973a2ae5806d 100644 (file)
--- a/pv/widgets/colorbutton.hpp
+++ b/pv/widgets/colorbutton.hpp
@@ -35,9 +35,17 @@ private:
        static const int SwatchMargin;
 
 public:
+       /**
+        * Construct a ColorButton instance that uses a QColorDialog
+        */
+       ColorButton(QWidget *parent);
+
+       /**
+        * Construct a ColorButton instance that uses a ColorPopup
+        */
        ColorButton(int rows, int cols, QWidget *parent);
 
-       ColorPopup& popup();
+       ColorPopup* popup();
 
        const QColor& color() const;
 
@@ -50,14 +58,14 @@ private:
 
 private Q_SLOTS:
        void on_clicked(bool);
-
        void on_selected(int row, int col);
+       void on_color_selected(const QColor& color);
 
 Q_SIGNALS:
        void selected(const QColor &color);
 
 private:
-       ColorPopup popup_;
+       ColorPopup* popup_;
        QColor cur_color_;
 };