Fix color pickers opens in dock layout when editing rules via

layer properties
qgis · Oct 28, 2016 · f63a69b · f63a69b
1 parent ada6050
commit f63a69b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/app/qgsrulebasedlabelingwidget.cpp b/src/app/qgsrulebasedlabelingwidget.cpp
@@ -144,7 +144,6 @@ void QgsRuleBasedLabelingWidget::editRule( const QModelIndex& index )
   QgsRuleBasedLabeling::Rule* rule = mModel->ruleForIndex( index );
 
   QgsLabelingRulePropsWidget* widget = new QgsLabelingRulePropsWidget( rule, mLayer, this, mCanvas );
-  widget->setDockMode( true );
   widget->setPanelTitle( tr( "Edit rule" ) );
   connect( widget, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( ruleWidgetPanelAccepted( QgsPanelWidget* ) ) );
   connect( widget, SIGNAL( widgetChanged() ), this, SLOT( liveUpdateRuleFromPanel() ) );

diff --git a/src/gui/symbology-ng/qgsrulebasedrendererwidget.cpp b/src/gui/symbology-ng/qgsrulebasedrendererwidget.cpp
@@ -180,7 +180,6 @@ void QgsRuleBasedRendererWidget::editRule( const QModelIndex& index )
   QgsRuleBasedRenderer::Rule* rule = mModel->ruleForIndex( index );
 
   QgsRendererRulePropsWidget* widget = new QgsRendererRulePropsWidget( rule, mLayer, mStyle, this, mContext );
-  widget->setDockMode( true );
   widget->setPanelTitle( tr( "Edit rule" ) );
   connect( widget, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( ruleWidgetPanelAccepted( QgsPanelWidget* ) ) );
   connect( widget, SIGNAL( widgetChanged() ), this, SLOT( liveUpdateRuleFromPanel() ) );
@@ -817,7 +816,7 @@ void QgsRendererRulePropsWidget::apply()
 void QgsRendererRulePropsWidget::setDockMode( bool dockMode )
 {
   QgsPanelWidget::setDockMode( dockMode );
-  mSymbolSelector->setDockMode( true );
+  mSymbolSelector->setDockMode( dockMode );
 }
 
 ////////