Restore cancel button in color dialog when used from layer properties

nyalldawson · nyalldawson · commit 5ac34ce86b1b · 2016-08-23T20:35:52.000+10:00
diff --git a/src/gui/qgscolorbutton.cpp b/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 ) ) );

Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,10 @@ const QPixmap& QgsColorButton::transparentBackground()`
`94`	`94`
`95`	`95`	`void QgsColorButton::showColorDialog()`
`96`	`96`	`{`
`97`		`- if ( QgsPanelWidget* panel = QgsPanelWidget::findParentPanel( this ) )`
	`97`	`+ QgsPanelWidget* panel = QgsPanelWidget::findParentPanel( this );`
	`98`	`+ if ( panel && panel->dockMode() )`
`98`	`99`	`{`
`99`		`- QgsCompoundColorWidget* colorWidget = new QgsCompoundColorWidget( panel, color(), panel->dockMode() ? QgsCompoundColorWidget::LayoutVertical :`
`100`		`- QgsCompoundColorWidget::LayoutDefault );`
	`100`	`+ QgsCompoundColorWidget* colorWidget = new QgsCompoundColorWidget( panel, color(), QgsCompoundColorWidget::LayoutVertical );`
`101`	`101`	`colorWidget->setPanelTitle( mColorDialogTitle );`
`102`	`102`	`colorWidget->setAllowAlpha( mAllowAlpha );`
`103`	`103`	`connect( colorWidget, SIGNAL( currentColorChanged( QColor ) ), this, SLOT( setValidTemporaryColor( QColor ) ) );`