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

5.15.8 - fix for QTBUG-98483 and QTBUG-99743

Browse Source
This commit is contained in:
kleuter 2022-02-18 13:41:05 +01:00
parent e58d60af60
commit 05e0fcafe6
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
5.15.8/qtbase/src/plugins/styles/mac/qmacstyle_mac.mm
View File

@ -1680,8 +1680,8 @@ bool QMacStylePrivate::CocoaControl::getCocoaButtonTypeAndBezelStyle(NSButtonTyp
*bezelStyle = NSShadowlessSquareBezelStyle; *bezelStyle = NSShadowlessSquareBezelStyle;
break; break;
case Button_PushButton: case Button_PushButton:
*buttonType = NSPushOnPushOffButton; *buttonType = NSButtonTypeMomentaryPushIn;
*bezelStyle = NSRoundedBezelStyle; *bezelStyle = NSBezelStyleRounded;
break; break;
default: default:
return false; return false;
@ -3725,8 +3725,15 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
pb.frame = frameRect.toCGRect(); pb.frame = frameRect.toCGRect();
pb.enabled = isEnabled; pb.enabled = isEnabled;
// With the 'momentary push in' type this gives an impression of a
// button in a 'pressed' state (the 'momentary push in' does
// not show its state otherwise):
[pb highlight:isPressed]; [pb highlight:isPressed];
pb.state = isHighlighted && !isPressed ? NSOnState : NSOffState; // For default/checked button this will give the required
// button accent color:
pb.keyEquivalent = isHighlighted ? @"\r" : @"";
d->drawNSViewInRect(pb, frameRect, p, ^(CGContextRef, const CGRect &r) { d->drawNSViewInRect(pb, frameRect, p, ^(CGContextRef, const CGRect &r) {
[pb.cell drawBezelWithFrame:r inView:pb.superview]; [pb.cell drawBezelWithFrame:r inView:pb.superview];
}); });
@ -3768,16 +3775,22 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
const bool hasText = !btn.text.isEmpty(); const bool hasText = !btn.text.isEmpty();
const bool isActive = btn.state & State_Active; const bool isActive = btn.state & State_Active;
const bool isPressed = btn.state & State_Sunken; const bool isPressed = btn.state & State_Sunken;
const bool isDefault = (btn.features & QStyleOptionButton::DefaultButton && !d->autoDefaultButton)
|| d->autoDefaultButton == btn.styleObject;
const auto ct = cocoaControlType(&btn, w); const auto ct = cocoaControlType(&btn, w);
if (!hasMenu && ct != QMacStylePrivate::Button_SquareButton) { if (!hasMenu && ct != QMacStylePrivate::Button_SquareButton) {
if (isPressed if (isPressed || (isActive && isEnabled && ((btn.state & State_On) || isDefault)))
|| (isActive && isEnabled btn.palette.setColor(QPalette::ButtonText, Qt::white);
&& ((btn.state & State_On) }
|| ((btn.features & QStyleOptionButton::DefaultButton) && !d->autoDefaultButton)
|| d->autoDefaultButton == btn.styleObject))) if (!isDarkMode() && QOperatingSystemVersion::current() > QOperatingSystemVersion::MacOSBigSur) {
btn.palette.setColor(QPalette::ButtonText, Qt::white); if (!isDefault && !(btn.state & State_On)) {
// On macOS 12 it's a gray button, white text color (if set in the
// previous statement) would be almost invisible.
btn.palette.setColor(QPalette::ButtonText, Qt::black);
}
} }
if ((!hasIcon && !hasMenu) || (hasIcon && !hasText)) { if ((!hasIcon && !hasMenu) || (hasIcon && !hasText)) {
@ -3955,6 +3968,13 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
} }
pb.frame = frameRect.toCGRect(); pb.frame = frameRect.toCGRect();
if (!isPopupButton) {
// Note: these days we use 'momentary push in' for Button_PushButton,
// but tabs are also rendered using NSButton/ButtonPushButton, and
// here we need 'push on/off' to make it work (tab highlight colors).
pb.buttonType = NSButtonTypePushOnPushOff;
}
pb.enabled = isEnabled; pb.enabled = isEnabled;
[pb highlight:isPressed]; [pb highlight:isPressed];
// Set off state when inactive. See needsInactiveHack for when it's selected // Set off state when inactive. See needsInactiveHack for when it's selected