Parcourir la source

Merge pull request #577 from BenjaminBeney/change_icon_for_invalid_color_in_ctkcolorpickerbutton

Change icon for invalid color in ctkColorPickerButton
Julien Finet il y a 10 ans
Parent
commit
1fec9778c5
1 fichiers modifiés avec 4 ajouts et 2 suppressions
  1. 4 2
      Libs/Widgets/ctkColorPickerButton.cpp

+ 4 - 2
Libs/Widgets/ctkColorPickerButton.cpp

@@ -78,10 +78,12 @@ void ctkColorPickerButtonPrivate::computeIcon()
   Q_Q(ctkColorPickerButton);
   int _iconSize = q->style()->pixelMetric(QStyle::PM_SmallIconSize);
   QPixmap pix(_iconSize, _iconSize);
-  pix.fill(q->palette().button().color());
+  pix.fill(this->Color.isValid() ?
+    q->palette().button().color() : Qt::transparent);
   QPainter p(&pix);
   p.setPen(QPen(Qt::gray));
-  p.setBrush(this->Color);
+  p.setBrush(this->Color.isValid() ?
+    pixmapColor : QBrush(Qt::BrushStyle::NoBrush));
   p.drawRect(2, 2, pix.width() - 5, pix.height() - 5);
 
   this->Icon = QIcon(pix);