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 ada6050 commit f63a69b3096105e490eee713553d8a39784e6701
Showing with 1 addition and 3 deletions.
  1. +0 −1 src/app/qgsrulebasedlabelingwidget.cpp
  2. +1 −2 src/gui/symbology-ng/qgsrulebasedrendererwidget.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() ) );
@@ -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 );
}

////////

0 comments on commit f63a69b

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