Fix problem with drawing color button when assigned color is invalid.

diff --git a/src/Qtx/QtxColorButton.cxx b/src/Qtx/QtxColorButton.cxx
index 9b9daec1796b077f600fd6ee51e8724a7f61593f..3fae561013896fc05efaaf7c58975458a14bb175 100644 (file)
--- a/src/Qtx/QtxColorButton.cxx
+++ b/src/Qtx/QtxColorButton.cxx
@@ -230,9 +230,6 @@ void QtxColorButton::paintEvent( QPaintEvent* e )
 {
   QToolButton::paintEvent( e );
 
-  if ( !color().isValid() )
-    return;
-
   QStyleOptionToolButton opt;
   opt.initFrom( this );
   opt.text = text();
@@ -245,7 +242,15 @@ void QtxColorButton::paintEvent( QPaintEvent* e )
 
   QPixmap pix( r.size() );
   pix.fill( palette().color( backgroundRole() ) );
-  drawColor( &pix, color() );
+
+  if ( color().isValid() )
+    drawColor( &pix, color() );
+  else {
+    QPainter pixp( &pix );
+    pixp.drawRect( 2, 2, pix.width() - 4, pix.height() - 4 );
+    pixp.fillRect( 3, 3, pix.width() - 6, pix.height() - 6, QBrush( Qt::BDiagPattern ) );
+    pixp.end();
+  }
 
   QPainter p( this );
   p.drawPixmap( r, pix );