amass/qt-build-tools
1
0
Fork 0
mirror of https://github.com/crystalidea/qt-build-tools.git synced 2024-11-26 04:31:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

5.15.7 - better fix for QTBUG-98483

Browse Source
This commit is contained in:
kleuter 2021-11-25 13:53:37 +01:00
parent d42c07546d
commit d3a3d28e3a
1 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
5.15.7/qtbase/src/plugins/styles/mac/qmacstyle_mac.mm
View File

@ -3724,6 +3724,9 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
const bool isEnabled = btn->state & State_Enabled;
const bool isPressed = btn->state & State_Sunken;
const bool isDefault = (btn->features & QStyleOptionButton::DefaultButton)
|| (btn->features & QStyleOptionButton::AutoDefaultButton
&& d->autoDefaultButton == btn->styleObject);
const bool isHighlighted = isActive &&
((btn->state & State_On)
|| (btn->features & QStyleOptionButton::DefaultButton)
@ -3743,6 +3746,32 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
pb.enabled = isEnabled;
[pb highlight:isPressed];
pb.state = isHighlighted && !isPressed ? NSOnState : NSOffState;
if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSMonterey) {
// Starting from macOS Monterey buttons look/work slightly differently. First, the
// the default/autodefault buttons. Setting the state to ON is enough to make
// NSButtonPushOnPushOf type of buttons to use the accent color. To make it look
// recessed/pressed, we have to combine _both_ the state ON, and highlight:YES
// (previously, we were simply using highlight:YES and state OFF for such case).
// Non-default buttons work differently - they don't use accent color, but
// instead either darker or lighter bezel when pressed(depending on the theme),
// which is simply activated by highlight:YES (those buttons are not push on/push
// off type anymore, so seem to ignore the state).
// We only adust those:
if (ct == QMacStylePrivate::Button_PushButton) {
if (isDefault)
pb.state = isActive ? NSControlStateValueOn : NSControlStateValueOff;
else {
pb.buttonType = NSButtonTypeMomentaryPushIn;
if (btn->state & State_On)
[pb highlight:YES];
}
}
// Note, for NSButtonTypeMomentaryPushIn we'll have to later adjust the text color
// accordingly, see CE_PushButtonLabel :(
}
d->drawNSViewInRect(pb, frameRect, p, ^(CGContextRef, const CGRect &r) {
[pb.cell drawBezelWithFrame:r inView:pb.superview];
});
@ -3787,15 +3816,23 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
const auto ct = cocoaControlType(&btn, w);
const bool isDefault = (btn.features & QStyleOptionButton::DefaultButton && !d->autoDefaultButton)
|| d->autoDefaultButton == btn.styleObject;
if (!hasMenu && ct != QMacStylePrivate::Button_SquareButton) {
if (isPressed
|| (isActive && isEnabled
&& ((btn.state & State_On)
|| ((btn.features & QStyleOptionButton::DefaultButton) && !d->autoDefaultButton)
|| d->autoDefaultButton == btn.styleObject)))
if (isPressed || (isActive && isEnabled
&& ((btn.state & State_On) || isDefault))) // Hello, LISP!
btn.palette.setColor(QPalette::ButtonText, Qt::white);
}
if (!isDarkMode() && QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSMonterey) {
if (!isDefault) {
// Yes, it's a gray button of type NSButtonTypeMomentaryPushIn (see CE_PushButtonBevel above),
// white text (if set in the previous statement) would be invisible.
btn.palette.setColor(QPalette::ButtonText, Qt::black);
}
}
if ((!hasIcon && !hasMenu) || (hasIcon && !hasText)) {
QCommonStyle::drawControl(ce, &btn, p, w);
} else {