Skip to content

Commit

Permalink
Fix color pickers opens in dock layout when editing rules via
Browse files Browse the repository at this point in the history
layer properties
  • Loading branch information
nyalldawson committed Oct 28, 2016
1 parent 65bd120 commit e812e43
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion src/app/qgsrulebasedlabelingwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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() ) );
Expand Down
3 changes: 1 addition & 2 deletions src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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() ) );
Expand Down Expand Up @@ -799,7 +798,7 @@ void QgsRendererRulePropsWidget::apply()
void QgsRendererRulePropsWidget::setDockMode( bool dockMode )
{
QgsPanelWidget::setDockMode( dockMode );
mSymbolSelector->setDockMode( true );
mSymbolSelector->setDockMode( dockMode );
}

////////
Expand Down

0 comments on commit e812e43

Please sign in to comment.