Use a generic approach when adding the "close on enter" hook for popups

[pulseview.git] / pv / view / trace.h

diff --git a/pv/view/trace.h b/pv/view/trace.h
index e2ed37fd444b6c37507ffe667e4bf83a3579c72b..7726be255f05db2e0f50307881ffc4763bdfe93a 100644 (file)
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -34,9 +34,6 @@
 class QFormLayout;
 
 namespace pv {
-
-class SigSession;
-
 namespace view {
 
 class View;
@@ -50,7 +47,7 @@ private:
        static const int LabelHitPadding;
 
 protected:
-       Trace(SigSession &session, QString name);
+       Trace(QString name);
 
 public:
        /**
@@ -115,7 +112,7 @@ public:
        virtual void paint_fore(QPainter &p, int left, int right);
 
        /**
-        * Paints the signal label into a QGLWidget.
+        * Paints the signal label.
         * @param p the QPainter to paint into.
         * @param right the x-coordinate of the right edge of the header
         *      area.
@@ -142,7 +139,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,46 +169,30 @@ protected:
 
        void add_colour_option(QWidget *parent, QFormLayout *form);
 
-       virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
-
-private:
+       void create_popup_form();
 
-       /**
-        * 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:
+private Q_SLOTS:
        void on_text_changed(const QString &text);
 
        void on_colour_changed(const QColor &colour);
 
        void on_popup_closed();
 
-signals:
+Q_SIGNALS:
        void visibility_changed();
        void text_changed();    
        void colour_changed();
 
 protected:
-       pv::SigSession &_session;
        pv::view::View *_view;
 
        QString _name;
        QColor _colour;
        int _v_offset;
 
-       QSizeF _text_size;
-
+private:
        pv::widgets::Popup *_popup;
        QFormLayout *_popup_form;
 };