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

5.15.7 - fixed QTBUG-98483

Browse Source
This commit is contained in:
kleuter 2021-11-23 15:36:02 +01:00
parent be2c83db52
commit d28c1a7216
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3726,7 +3726,18 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
pb.enabled = isEnabled; pb.enabled = isEnabled;
[pb highlight:isPressed]; [pb highlight:isPressed];
pb.state = isHighlighted && !isPressed ? NSOnState : NSOffState;
// In the past 'highlight' was doing its job nicely, giving an image of recessed
// (e.g.) blue button which looks differently from un-pressed 'default' button.
// Starting from Monterey this is not enough - with simple highlight and the state
// 'off' we get a button that looks like have it suddenly lost its theme embellishment
// and depending on the app's appearance, we may also erroneously draw a text with
// (e.g.) white on light grey.
if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSMonterey)
pb.state = isHighlighted || isPressed ? NSControlStateValueOn : NSControlStateValueOff;
else
pb.state = isHighlighted && !isPressed ? NSControlStateValueOn : NSControlStateValueOff;
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];
}); });