diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2018-04-02 13:35:22 -0700 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2018-04-05 21:03:57 +0000 |
| commit | cff91429424c0b10c1bd562f2f9699ef2faa30f0 (patch) | |
| tree | 2c312a4ed155626a444a5231ff43028d83f12e9f /src | |
| parent | 63a433f6c855684f2b3a25fdd7cbbfdacf1954e1 (diff) | |
QMacStyle: Fix "on" toggle button text color
Change-Id: I344c63debdcf012a16305f1b2124e8ad0785d982
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 10649e6115..38373087cb 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -3954,7 +3954,8 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter if (!hasMenu && ct != QMacStylePrivate::Button_SquareButton) { if (isPressed || (isActive && isEnabled - && ((btn.features & QStyleOptionButton::DefaultButton && !d->autoDefaultButton) + && ((btn.state & State_On) + || ((btn.features & QStyleOptionButton::DefaultButton) && !d->autoDefaultButton) || d->autoDefaultButton == btn.styleObject))) btn.palette.setColor(QPalette::ButtonText, Qt::white); } |