[gui] Fix color button where initially set color is same as default, …

…but does not set background of button
qgis · Sep 16, 2013 · 773e0d49f15355de03a90b756068f863259357f0 · 773e0d4
1 parent 2d728d7
commit 773e0d49f15355de03a90b756068f863259357f0
Showing with 5 additions and 1 deletion.

+4 −1 src/gui/qgscolorbutton.cpp

+1 −0 src/gui/qgscolorbutton.h
diff --git a/src/gui/qgscolorbutton.cpp b/src/gui/qgscolorbutton.cpp
@@ -45,6 +45,7 @@ QgsColorButton::QgsColorButton( QWidget *parent, QString cdt, QColorDialog::Colo
     , mColorDialogOptions( cdo )
     , mAcceptLiveUpdates( true )
     , mTempPNG( NULL )
+    , mColorSet( false )
 {
   connect( this, SIGNAL( clicked() ), this, SLOT( onButtonClicked() ) );
 }
@@ -134,7 +135,8 @@ void QgsColorButton::setColor( const QColor &color )
   QColor oldColor = mColor;
   mColor = color;
 
-  if ( oldColor != mColor )
+  // handle when initially set color is same as default (Qt::black); consider it a color change
+  if ( oldColor != mColor || ( mColor == QColor( Qt::black ) && !mColorSet ) )
   {
     setButtonBackground();
     if ( isEnabled() )
@@ -144,6 +146,7 @@ void QgsColorButton::setColor( const QColor &color )
       emit colorChanged( mColor );
     }
   }
+  mColorSet = true;
 }
 
 void QgsColorButton::setButtonBackground()

diff --git a/src/gui/qgscolorbutton.h b/src/gui/qgscolorbutton.h
@@ -140,6 +140,7 @@ class GUI_EXPORT QgsColorButton: public QPushButton
     QColorDialog::ColorDialogOptions mColorDialogOptions;
     bool mAcceptLiveUpdates;
     QTemporaryFile mTempPNG;
+    bool mColorSet; // added in QGIS 2.1
 
   private slots:
     void onButtonClicked();