AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QMacStyle: Don't highlight square buttons text when pressed

Browse Source 
Native square buttons keep their text black when pressed or on.

Plus using the QStyleOptionButton variable over the QStyleOption
one where appropriate.

Change-Id: Idba8197e64d408e8a0987f1ef9243fde08e3e839
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Gabriel de Dietrich 2018-03-19 13:15:00 -07:00
parent b8dc00ea4b
commit fae42e1e73
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/styles/mac/qmacstyle_mac.mm
View File

@ -3958,8 +3958,8 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
// takes precedence over a normal default button
if ((btn->features & QStyleOptionButton::AutoDefaultButton)
&& isActive && hasFocus)
d->autoDefaultButton = opt->styleObject;
else if (d->autoDefaultButton == opt->styleObject)
d->autoDefaultButton = btn->styleObject;
else if (d->autoDefaultButton == btn->styleObject)
d->autoDefaultButton = nullptr;
const bool isEnabled = btn->state & State_Enabled;
@ -3971,7 +3971,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
&& d->autoDefaultButton == btn->styleObject));
const bool hasMenu = btn->features & QStyleOptionButton::HasMenu;
const auto ct = cocoaControlType(btn, w);
const auto cs = d->effectiveAquaSizeConstrain(opt, w);
const auto cs = d->effectiveAquaSizeConstrain(btn, w);
const auto cw = QMacStylePrivate::CocoaControl(ct, cs);
auto *pb = static_cast<NSButton *>(d->cocoaControl(cw));
// Ensure same size and location as we used to have with HITheme.
@ -4041,7 +4041,9 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
const bool isActive = btn.state & State_Active;
const bool isPressed = btn.state & State_Sunken;
if (!hasMenu) {
const auto ct = cocoaControlType(&btn, w);
if (!hasMenu && ct != QMacStylePrivate::Button_SquareButton) {
if (isPressed
|| (isActive
&& ((btn.features & QStyleOptionButton::DefaultButton && !d->autoDefaultButton)