Fix color pickers opens in dock layout when editing rules via

nyalldawson · nyalldawson · commit e812e430500a · 2016-10-28T11:13:26.000+10:00
layer properties
diff --git a/src/app/qgsrulebasedlabelingwidget.cpp b/src/app/qgsrulebasedlabelingwidget.cpp
@@ -141,7 +141,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/qgsrulebasedrendererv2widget.cpp b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
@@ -178,7 +178,6 @@ void QgsRuleBasedRendererV2Widget::editRule( const QModelIndex& index )
   QgsRuleBasedRendererV2::Rule* rule = mModel->ruleForIndex( index );
 
   QgsRendererRulePropsWidget* widget = new QgsRendererRulePropsWidget( rule, mLayer, mStyle, this, mMapCanvas );
-  widget->setDockMode( true );
   widget->setPanelTitle( tr( "Edit rule" ) );
   connect( widget, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( ruleWidgetPanelAccepted( QgsPanelWidget* ) ) );
   connect( widget, SIGNAL( widgetChanged() ), this, SLOT( liveUpdateRuleFromPanel() ) );
@@ -799,7 +798,7 @@ void QgsRendererRulePropsWidget::apply()
 void QgsRendererRulePropsWidget::setDockMode( bool dockMode )
 {
   QgsPanelWidget::setDockMode( dockMode );
-  mSymbolSelector->setDockMode( true );
+  mSymbolSelector->setDockMode( dockMode );
 }
 
 ////////

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,6 @@ void QgsRuleBasedRendererV2Widget::editRule( const QModelIndex& index )`
`178`	`178`	`QgsRuleBasedRendererV2::Rule* rule = mModel->ruleForIndex( index );`
`179`	`179`
`180`	`180`	`QgsRendererRulePropsWidget* widget = new QgsRendererRulePropsWidget( rule, mLayer, mStyle, this, mMapCanvas );`
`181`		`- widget->setDockMode( true );`
`182`	`181`	`widget->setPanelTitle( tr( "Edit rule" ) );`
`183`	`182`	`connect( widget, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( ruleWidgetPanelAccepted( QgsPanelWidget* ) ) );`
`184`	`183`	`connect( widget, SIGNAL( widgetChanged() ), this, SLOT( liveUpdateRuleFromPanel() ) );`
`@@ -799,7 +798,7 @@ void QgsRendererRulePropsWidget::apply()`
`799`	`798`	`void QgsRendererRulePropsWidget::setDockMode( bool dockMode )`
`800`	`799`	`{`
`801`	`800`	`QgsPanelWidget::setDockMode( dockMode );`
`802`		`- mSymbolSelector->setDockMode( true );`
	`801`	`+ mSymbolSelector->setDockMode( dockMode );`
`803`	`802`	`}`
`804`	`803`
`805`	`804`	`////////`