X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.h;h=2d8c7cf1f17d35bafec31ac567c3ba66d94bc56a;hp=85d137bcbd21cdd50b1c172defc9d6d2a8d2f1d5;hb=d7c0ca4a965c5f9cb2ae9aea584bb2547f4baca1;hpb=b213ef0991a13af0c74ffe5c54382c5c455c5496

diff --git a/pv/view/trace.h b/pv/view/trace.h
index 85d137bc..2d8c7cf1 100644
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -142,7 +142,17 @@ public:
 	 */
 	int get_y() const;
 
+	/**
+	 * Computes the outline rectangle of a label.
+	 * @param p the QPainter to lay out text with.
+	 * @param right the x-coordinate of the right edge of the header
+	 * 	area.
+	 * @return Returns the rectangle of the signal label.
+	 */
+	QRectF get_label_rect(int right);
+
 protected:
+
 	/**
 	 * Gets the text colour.
 	 * @remarks This colour is computed by comparing the lightness
@@ -162,29 +172,17 @@ protected:
 
 	void add_colour_option(QWidget *parent, QFormLayout *form);
 
-	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
+	void create_popup_form();
 
-private:
-
-	/**
-	 * Computes an caches the size of the label text.
-	 */
-	void compute_text_size(QPainter &p);
-
-	/**
-	 * Computes the outline rectangle of a label.
-	 * @param p the QPainter to lay out text with.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
-	 * @return Returns the rectangle of the signal label.
-	 */
-	QRectF get_label_rect(int right);
+	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 private slots:
 	void on_text_changed(const QString &text);
 
 	void on_colour_changed(const QColor &colour);
 
+	void on_popup_closed();
+
 signals:
 	void visibility_changed();
 	void text_changed();	
@@ -198,7 +196,9 @@ protected:
 	QColor _colour;
 	int _v_offset;
 
-	QSizeF _text_size;
+private:
+	pv::widgets::Popup *_popup;
+	QFormLayout *_popup_form;
 };
 
 } // namespace view