Fix cyclical QPaintEvent updates for color button, which caused exces…

…sive cpu cycles
qgis · Mar 30, 2013 · 5660bc5 · 5660bc5
1 parent 0229ea9
commit 5660bc5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/gui/qgscolorbutton.cpp b/src/gui/qgscolorbutton.cpp
@@ -106,10 +106,22 @@ void QgsColorButton::changeEvent( QEvent* e )
   QPushButton::changeEvent( e );
 }
 
+#if 0 // causes too many cyclical updates, but may be needed on some platforms
 void QgsColorButton::paintEvent( QPaintEvent* e )
 {
-  setButtonBackground();
   QPushButton::paintEvent( e );
+
+  if ( !mBackgroundSet )
+  {
+    setButtonBackground();
+  }
+}
+#endif
+
+void QgsColorButton::showEvent( QShowEvent* e )
+{
+  setButtonBackground();
+  QPushButton::showEvent( e );
 }
 
 void QgsColorButton::setColor( const QColor &color )

diff --git a/src/gui/qgscolorbutton.h b/src/gui/qgscolorbutton.h
@@ -117,7 +117,10 @@ class GUI_EXPORT QgsColorButton: public QPushButton
 
   protected:
     void changeEvent( QEvent* e );
+#if 0 // causes too many cyclical updates, but may be needed on some platforms
     void paintEvent( QPaintEvent* e );
+#endif
+    void showEvent( QShowEvent* e );
     static const QPixmap& transpBkgrd();
 
   private: