When a panel widget opens a new panel, the new panel should inherit

the dock mode of the previous panel

Author: nyalldawson

src/gui/qgspanelwidget.cpp

@@ -62,6 +62,9 @@ QgsPanelWidget*QgsPanelWidget::findParentPanel( QWidget* widget )
 
 void QgsPanelWidget::openPanel( QgsPanelWidget* panel )
 {
+  //panel dock mode inherits from this panel
+  panel->setDockMode( dockMode() );
+
   if ( mDockMode )
   {
     emit showPanel( panel );

src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp

@@ -549,7 +549,6 @@ void QgsCategorizedSymbolRendererWidget::changeCategorizedSymbol()
 {
   QgsSymbol* newSymbol = mCategorizedSymbol->clone();
   QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( newSymbol, mStyle, mLayer, nullptr );
-  dlg->setDockMode( this->dockMode() );
   dlg->setMapCanvas( mMapCanvas );
 
   connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateSymbolsFromWidget() ) );
@@ -594,7 +593,6 @@ void QgsCategorizedSymbolRendererWidget::changeCategorySymbol()
   }
 
   QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( symbol, mStyle, mLayer, nullptr );
-  dlg->setDockMode( this->dockMode() );
   dlg->setMapCanvas( mMapCanvas );
   connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateSymbolsFromWidget() ) );
   connect( dlg, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( cleanUpSymbolSelector( QgsPanelWidget* ) ) );

src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp

@@ -907,7 +907,6 @@ void QgsGraduatedSymbolRendererWidget::changeRangeSymbol( int rangeIdx )
 {
   QgsSymbol* newSymbol = mRenderer->ranges()[rangeIdx].symbol()->clone();
   QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( newSymbol, mStyle, mLayer, nullptr );
-  dlg->setDockMode( this->dockMode() );
   dlg->setMapCanvas( mMapCanvas );
 
   connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateSymbolsFromWidget() ) );

src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp

@@ -215,7 +215,6 @@ void QgsPointDisplacementRendererWidget::on_mRendererSettingsButton_clicked()
     QgsRendererWidget* w = m->createRendererWidget( mLayer, mStyle, mRenderer->embeddedRenderer()->clone() );
     w->setMapCanvas( mMapCanvas );
     connect( w, SIGNAL( widgetChanged() ), this, SLOT( updateRendererFromWidget() ) );
-    w->setDockMode( this->dockMode() );
     openPanel( w );
   }
 }
@@ -351,7 +350,6 @@ void QgsPointDisplacementRendererWidget::on_mCenterSymbolPushButton_clicked()
   }
   QgsMarkerSymbol* markerSymbol = mRenderer->centerSymbol()->clone();
   QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( markerSymbol, QgsStyle::defaultStyle(), mLayer, this );
-  dlg->setDockMode( this->dockMode() );
   dlg->setMapCanvas( mMapCanvas );
   connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateCenterSymbolFromWidget() ) );
   connect( dlg, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( cleanUpSymbolSelector( QgsPanelWidget* ) ) );

src/gui/symbology-ng/qgsrulebasedrendererwidget.cpp

@@ -260,7 +260,6 @@ void QgsRuleBasedRendererWidget::refineRuleCategoriesGui( const QModelIndexList&
   QgsCategorizedSymbolRendererWidget* w = new QgsCategorizedSymbolRendererWidget( mLayer, mStyle, nullptr );
   w->setPanelTitle( tr( "Add categories to rules" ) );
   connect( w, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( refineRuleCategoriesAccepted( QgsPanelWidget* ) ) );
-  w->setDockMode( this->dockMode() );
   w->setMapCanvas( mMapCanvas );
   openPanel( w );
 }
@@ -271,7 +270,6 @@ void QgsRuleBasedRendererWidget::refineRuleRangesGui( const QModelIndexList& )
   w->setPanelTitle( tr( "Add ranges to rules" ) );
   connect( w, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( refineRuleRangesAccepted( QgsPanelWidget* ) ) );
   w->setMapCanvas( mMapCanvas );
-  w->setDockMode( this->dockMode() );
   openPanel( w );
 }