Skip to content
Permalink
Browse files

Fix color pickers opens in dock layout when editing rules via

layer properties
  • Loading branch information
nyalldawson committed Oct 28, 2016
1 parent 65bd120 commit e812e430500a765f65c9452de0549abedb81f97c
@@ -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() ) );
@@ -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 );
}

////////

0 comments on commit e812e43

Please sign in to comment.
You can’t perform that action at this time.