X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fwidgets%2Fcolorbutton.hpp;h=4726c1bb41bf566384298a3e13af973a2ae5806d;hb=323715c41a09a1aba08f4b716e9d93da58f0f3a8;hp=37cd6e73f0dd9fbdc98bc0c8aa75add8c91dfe85;hpb=641574bcc118be0b6dc3a65039ab3497f9d7241a;p=pulseview.git

diff --git a/pv/widgets/colorbutton.hpp b/pv/widgets/colorbutton.hpp
index 37cd6e73..4726c1bb 100644
--- 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_;
 };