Removed use of LabelMarginWidth

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

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index ffbab0639ceac05500896a94d59655bc3c5c68d0..d06c24b5e63ed98d98a7f190851ed2667f9d5ccc 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -41,7 +41,9 @@ const int Trace::LabelHitPadding = 2;
 Trace::Trace(pv::SigSession &session, QString name) :
        _session(session),
        _name(name),
-       _v_offset(0)
+       _v_offset(0),
+       _popup(NULL),
+       _popup_form(NULL)
 {
 }
 
@@ -86,6 +88,8 @@ void Trace::paint_back(QPainter &p, int left, int right)
        (void)p;
        (void)left;
        (void)right;
+
+       compute_text_size(p);
 }
 
 void Trace::paint_mid(QPainter &p, int left, int right)
@@ -179,11 +183,15 @@ QMenu* Trace::create_context_menu(QWidget *parent)
 pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 {
        using pv::widgets::Popup;
-       Popup *const popup = new Popup(parent);
-       QFormLayout *const form = new QFormLayout(popup);
-       popup->setLayout(form);
-       populate_popup_form(popup, form);
-       return popup;
+
+       _popup = new Popup(parent);
+
+       create_popup_form();
+
+       connect(_popup, SIGNAL(closed()),
+               this, SLOT(on_popup_closed()));
+
+       return _popup;
 }
 
 int Trace::get_y() const
@@ -216,6 +224,22 @@ void Trace::add_colour_option(QWidget *parent, QFormLayout *form)
        form->addRow(tr("Colour"), colour_button);
 }
 
+void Trace::create_popup_form()
+{
+       // Clear the layout
+
+       // Transfer the layout and the child widgets to a temporary widget
+       // which then goes out of scope destroying the layout and all the child
+       // widgets.
+       if (_popup_form)
+               QWidget().setLayout(_popup_form);
+
+       // Repopulate the popup
+       _popup_form = new QFormLayout(_popup);
+       _popup->setLayout(_popup_form);
+       populate_popup_form(_popup, _popup_form);
+}
+
 void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
        QLineEdit *const name_edit = new QLineEdit(parent);
@@ -250,6 +274,12 @@ QRectF Trace::get_label_rect(int right)
                label_size.width(), label_size.height());
 }
 
+void Trace::on_popup_closed()
+{
+       _popup = NULL;
+       _popup_form = NULL;
+}
+
 void Trace::on_text_changed(const QString &text)
 {
        set_name(text);