From: Joel Holdsworth <redacted>
Date: Sun, 24 Nov 2013 16:16:38 +0000 (+0000)
Subject: Update the popup when a decoder is stacked
X-Git-Tag: pulseview-0.2.0~211
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=37fd11b167b2c258610b629bc4e17fc158b13a48

Update the popup when a decoder is stacked
---

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 7e2051a4..d3d10b69 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -346,6 +346,8 @@ void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
 	_decoder_stack->push(shared_ptr<data::decode::Decoder>(
 		new data::decode::Decoder(decoder)));
 	_decoder_stack->begin_decode();
+
+	create_popup_form();
 }
 
 } // namespace view
diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 79255bec..464cadcd 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -183,10 +183,8 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 	using pv::widgets::Popup;
 
 	_popup = new Popup(parent);
-	_popup_form = new QFormLayout(_popup);
-	_popup->setLayout(_popup_form);
 
-	populate_popup_form(_popup, _popup_form);
+	create_popup_form();
 
 	connect(_popup, SIGNAL(closed()),
 		this, SLOT(on_popup_closed()));
@@ -224,6 +222,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);
diff --git a/pv/view/trace.h b/pv/view/trace.h
index e2ed37fd..72f8e8a8 100644
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -162,6 +162,8 @@ protected:
 
 	void add_colour_option(QWidget *parent, QFormLayout *form);
 
+	void create_popup_form();
+
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 private:
@@ -202,6 +204,7 @@ protected:
 
 	QSizeF _text_size;
 
+private:
 	pv::widgets::Popup *_popup;
 	QFormLayout *_popup_form;
 };