Correctly emit panelAccepted when panel is not in dock mode

nyalldawson · nyalldawson · commit d073ca29a7c9 · 2016-10-06T21:09:01.000+10:00
Fixes #15373 - refine current rule not working when symbol widgets are not used in the style dock This fixes a behavioural difference when new panels are opened in a QgsPanelWidget when in docked/undocked mode. When in docked mode, the newly opened panel will emit panelAccepted when it is accepted. But for undocked mode, the parent panel was emitting the panelAccepted signal and so the connection to update the renderer was never triggered. Now both docked/undocked panels will always emit panelAccepted ONLY from the newly opened panel itself. This also fixes memory leaks as the clean up code was never run in undocked mode. I've updated the docs to clarify this behaviour. (cherry-picked from ddbd25d)
diff --git a/python/gui/qgspanelwidget.sip b/python/gui/qgspanelwidget.sip
@@ -89,6 +89,9 @@ class QgsPanelWidget : public QWidget
      * @param panel The panel widget that was accepted.
      * @note This argument is normally raised with emit panelAccepted(this)
      * so that callers can retrive the widget easier in calling code.
+     * @note this is emitted only when this panel is accepted, and is not emitted for
+     * child panels. Eg, if this panel opens a second stacked panel, then this panel
+     * will not emit panelAccepted when the second panel is accepted.
      */
     void panelAccepted( QgsPanelWidget* panel );
 
diff --git a/src/gui/qgspanelwidget.cpp b/src/gui/qgspanelwidget.cpp
@@ -84,7 +84,7 @@ void QgsPanelWidget::openPanel( QgsPanelWidget* panel )
     dlg->layout()->addWidget( buttonBox );
     dlg->exec();
     settings.setValue( key, dlg->saveGeometry() );
-    emit panelAccepted( panel );
+    panel->acceptPanel();
   }
 }
 
diff --git a/src/gui/qgspanelwidget.h b/src/gui/qgspanelwidget.h
@@ -108,6 +108,9 @@ class GUI_EXPORT QgsPanelWidget : public QWidget
      * @param panel The panel widget that was accepted.
      * @note This argument is normally raised with emit panelAccepted(this)
      * so that callers can retrive the widget easier in calling code.
+     * @note this is emitted only when this panel is accepted, and is not emitted for
+     * child panels. Eg, if this panel opens a second stacked panel, then this panel
+     * will not emit panelAccepted when the second panel is accepted.
      */
     void panelAccepted( QgsPanelWidget* panel );
 

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void QgsPanelWidget::openPanel( QgsPanelWidget* panel )`
`84`	`84`	`dlg->layout()->addWidget( buttonBox );`
`85`	`85`	`dlg->exec();`
`86`	`86`	`settings.setValue( key, dlg->saveGeometry() );`
`87`		`- emit panelAccepted( panel );`
	`87`	`+ panel->acceptPanel();`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`