feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Handle invalid colors in QtColorButton

Browse Source 
Paint a sublte placeholder.

Change-Id: I4fc0a51744a98621fb8289ce7cddfc2ccd43784f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2023-03-28 14:28:59 +02:00
parent 4b606ba9de
commit 3aa0291cd1
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/libs/utils/qtcolorbutton.cpp
View File

@@ -3,6 +3,8 @@
#include "qtcolorbutton.h" #include "qtcolorbutton.h"
#include "theme/theme.h"
#include <QApplication> #include <QApplication>
#include <QColorDialog> #include <QColorDialog>
#include <QDrag> #include <QDrag>
@@ -160,9 +162,25 @@ void QtColorButton::paintEvent(QPaintEvent *event)
{ {
Q_UNUSED(event) Q_UNUSED(event)
constexpr Theme::Color overlayColor = Theme::TextColorNormal;
constexpr qreal overlayOpacity = 0.25;
QPainter p(this); QPainter p(this);
if (isEnabled()) { const QColor color = d_ptr->shownColor();
QBrush br(d_ptr->shownColor()); if (!color.isValid()) {
constexpr int size = 11;
const qreal horPadding = (width() - size) / 2.0;
const qreal verPadding = (height() - size) / 2.0;
const QPen pen(creatorTheme()->color(overlayColor), 2);
p.save();
p.setOpacity(overlayOpacity);
p.setPen(pen);
p.setRenderHint(QPainter::Antialiasing);
p.drawLine(QLineF(horPadding, height() - verPadding, width() - horPadding, verPadding));
p.restore();
} else if (isEnabled()) {
QBrush br(color);
if (d_ptr->m_backgroundCheckered) { if (d_ptr->m_backgroundCheckered) {
const int pixSize = 10; const int pixSize = 10;
QPixmap pm(2 * pixSize, 2 * pixSize); QPixmap pm(2 * pixSize, 2 * pixSize);
@@ -170,7 +188,7 @@ void QtColorButton::paintEvent(QPaintEvent *event)
QPainter pmp(&pm); QPainter pmp(&pm);
pmp.fillRect(0, pixSize, pixSize, pixSize, Qt::black); pmp.fillRect(0, pixSize, pixSize, pixSize, Qt::black);
pmp.fillRect(pixSize, 0, pixSize, pixSize, Qt::black); pmp.fillRect(pixSize, 0, pixSize, pixSize, Qt::black);
pmp.fillRect(pm.rect(), d_ptr->shownColor()); pmp.fillRect(pm.rect(), color);
br = QBrush(pm); br = QBrush(pm);
p.setBrushOrigin((width() - pixSize) / 2, (height() - pixSize) / 2); p.setBrushOrigin((width() - pixSize) / 2, (height() - pixSize) / 2);
} }
@@ -184,8 +202,8 @@ void QtColorButton::paintEvent(QPaintEvent *event)
p.setPen(pen); p.setPen(pen);
p.setCompositionMode(QPainter::CompositionMode_Difference); p.setCompositionMode(QPainter::CompositionMode_Difference);
} else { } else {
p.setPen(palette().text().color()); p.setPen(creatorTheme()->color(overlayColor));
p.setOpacity(0.25); p.setOpacity(overlayOpacity);
} }
p.drawRect(rect().adjusted(0, 0, -1, -1)); p.drawRect(rect().adjusted(0, 0, -1, -1));
} }