Skip to content
Permalink
Browse files

Restore cancel button in color dialog when used from layer properties

  • Loading branch information
nyalldawson committed Aug 23, 2016
1 parent 993aa84 commit 5ac34ce86b1b51a0a5864d44e5037c7e055c7310
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/gui/qgscolorbutton.cpp
@@ -94,10 +94,10 @@ const QPixmap& QgsColorButton::transparentBackground()

void QgsColorButton::showColorDialog()
{
if ( QgsPanelWidget* panel = QgsPanelWidget::findParentPanel( this ) )
QgsPanelWidget* panel = QgsPanelWidget::findParentPanel( this );
if ( panel && panel->dockMode() )
{
QgsCompoundColorWidget* colorWidget = new QgsCompoundColorWidget( panel, color(), panel->dockMode() ? QgsCompoundColorWidget::LayoutVertical :
QgsCompoundColorWidget::LayoutDefault );
QgsCompoundColorWidget* colorWidget = new QgsCompoundColorWidget( panel, color(), QgsCompoundColorWidget::LayoutVertical );
colorWidget->setPanelTitle( mColorDialogTitle );
colorWidget->setAllowAlpha( mAllowAlpha );
connect( colorWidget, SIGNAL( currentColorChanged( QColor ) ), this, SLOT( setValidTemporaryColor( QColor ) ) );

0 comments on commit 5ac34ce

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