1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Use new QPlatformTheme::appearance() function

Browse Source 
Instead of qt_mac_applicationIsInDarkMode().

Task-number: QTBUG-94859
Change-Id: Ib64c081adfafb2843a7593d0e35668cce70cffd0
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Mitch Curtis 2021-08-30 14:17:00 +02:00
parent 2248487c6c
commit fae419a8e6
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,6 +196,8 @@ const int pushButtonBevelRectOffsets[3] = {
QVector<QPointer<QObject> > QMacStylePrivate::scrollBars; QVector<QPointer<QObject> > QMacStylePrivate::scrollBars;
bool isDarkMode() { return QGuiApplicationPrivate::platformTheme()->appearance() == QPlatformTheme::Appearance::Dark; }
// Title bar gradient colors for Lion were determined by inspecting PSDs exported // Title bar gradient colors for Lion were determined by inspecting PSDs exported
// using CoreUI's CoreThemeDocument; there is no public API to retrieve them // using CoreUI's CoreThemeDocument; there is no public API to retrieve them
@ -216,7 +218,7 @@ static QLinearGradient titlebarGradientActive()
gradient.setColorAt(1, QColor(180, 180, 180)); gradient.setColorAt(1, QColor(180, 180, 180));
return gradient; return gradient;
}(); }();
return qt_mac_applicationIsInDarkMode() ? darkGradient : lightGradient; return isDarkMode() ? darkGradient : lightGradient;
} }
static QLinearGradient titlebarGradientInactive() static QLinearGradient titlebarGradientInactive()
@ -232,7 +234,7 @@ static QLinearGradient titlebarGradientInactive()
gradient.setColorAt(1, QColor(225, 225, 225)); gradient.setColorAt(1, QColor(225, 225, 225));
return gradient; return gradient;
}(); }();
return qt_mac_applicationIsInDarkMode() ? darkGradient : lightGradient; return isDarkMode() ? darkGradient : lightGradient;
} }
#if QT_CONFIG(tabwidget) #if QT_CONFIG(tabwidget)
@ -254,7 +256,7 @@ static void clipTabBarFrame(const QStyleOption *option, const QMacStyle *style,
Q_ASSERT(style); Q_ASSERT(style);
Q_ASSERT(ctx); Q_ASSERT(ctx);
if (qt_mac_applicationIsInDarkMode()) { if (isDarkMode()) {
QTabWidget *tabWidget = qobject_cast<QTabWidget *>(option->styleObject); QTabWidget *tabWidget = qobject_cast<QTabWidget *>(option->styleObject);
Q_ASSERT(tabWidget); Q_ASSERT(tabWidget);
@ -302,7 +304,6 @@ static const qreal titleBarButtonSpacing = 8;
// active: window is active // active: window is active
// selected: tab is selected // selected: tab is selected
// hovered: tab is hovered // hovered: tab is hovered
bool isDarkMode() { return qt_mac_applicationIsInDarkMode(); }
#if QT_CONFIG(tabbar) #if QT_CONFIG(tabbar)
static const QColor lightTabBarTabBackgroundActive(190, 190, 190); static const QColor lightTabBarTabBackgroundActive(190, 190, 190);
@ -422,7 +423,7 @@ public:
{ {
#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14) #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14)
if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSMojave if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSMojave
&& !qt_mac_applicationIsInDarkMode()) { && !isDarkMode()) {
auto requiredAppearanceName = NSApplication.sharedApplication.effectiveAppearance.name; auto requiredAppearanceName = NSApplication.sharedApplication.effectiveAppearance.name;
if (![NSAppearance.currentAppearance.name isEqualToString:requiredAppearanceName]) { if (![NSAppearance.currentAppearance.name isEqualToString:requiredAppearanceName]) {
previous = NSAppearance.currentAppearance; previous = NSAppearance.currentAppearance;
@ -1288,7 +1289,7 @@ void QMacStylePrivate::drawFocusRing(QPainter *p, const QRectF &targetRect, int
} }
auto focusRingColor = qt_mac_toQColor(NSColor.keyboardFocusIndicatorColor.CGColor); auto focusRingColor = qt_mac_toQColor(NSColor.keyboardFocusIndicatorColor.CGColor);
if (!qt_mac_applicationIsInDarkMode()) { if (!isDarkMode()) {
// This color already has alpha ~ 0.25, this value is too small - the ring is // This color already has alpha ~ 0.25, this value is too small - the ring is
// very pale and nothing like the native one. 0.39 makes it better (not ideal // very pale and nothing like the native one. 0.39 makes it better (not ideal
// anyway). The color seems to be correct in dark more without any modification. // anyway). The color seems to be correct in dark more without any modification.
@ -1836,7 +1837,7 @@ NSView *QMacStylePrivate::cocoaControl(CocoaControl widget) const
if (widget.type == Box) { if (widget.type == Box) {
if (__builtin_available(macOS 10.14, *)) { if (__builtin_available(macOS 10.14, *)) {
if (qt_mac_applicationIsInDarkMode()) { if (isDarkMode()) {
// See render code in drawPrimitive(PE_FrameTabWidget) // See render code in drawPrimitive(PE_FrameTabWidget)
widget.type = Box_Dark; widget.type = Box_Dark;
} }
@ -3102,7 +3103,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
auto adjustedRect = opt->rect; auto adjustedRect = opt->rect;
bool needTranslation = false; bool needTranslation = false;
if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSMojave if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSMojave
&& !qt_mac_applicationIsInDarkMode()) { && !isDarkMode()) {
// In Aqua theme we have to use the 'default' NSBox (as opposite // In Aqua theme we have to use the 'default' NSBox (as opposite
// to the 'custom' QDarkNSBox we use in dark theme). Since -drawRect: // to the 'custom' QDarkNSBox we use in dark theme). Since -drawRect:
// does nothing in default NSBox, we call -displayRectIgnoringOpaticty:. // does nothing in default NSBox, we call -displayRectIgnoringOpaticty:.
@ -3150,7 +3151,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
theStroker.setCapStyle(Qt::FlatCap); theStroker.setCapStyle(Qt::FlatCap);
theStroker.setDashPattern(QVector<qreal>() << 1 << 2); theStroker.setDashPattern(QVector<qreal>() << 1 << 2);
path = theStroker.createStroke(path); path = theStroker.createStroke(path);
const auto dark = qt_mac_applicationIsInDarkMode() ? opt->palette.dark().color().darker() const auto dark = isDarkMode() ? opt->palette.dark().color().darker()
: QColor(0, 0, 0, 119); : QColor(0, 0, 0, 119);
p->fillPath(path, dark); p->fillPath(path, dark);
} }
@ -3344,7 +3345,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
static_cast<NSTextFieldCell *>(tf.cell).bezelStyle = isRounded ? NSTextFieldRoundedBezel : NSTextFieldSquareBezel; static_cast<NSTextFieldCell *>(tf.cell).bezelStyle = isRounded ? NSTextFieldRoundedBezel : NSTextFieldSquareBezel;
tf.frame = opt->rect.toCGRect(); tf.frame = opt->rect.toCGRect();
d->drawNSViewInRect(tf, opt->rect, p, ^(CGContextRef, const CGRect &rect) { d->drawNSViewInRect(tf, opt->rect, p, ^(CGContextRef, const CGRect &rect) {
if (!qt_mac_applicationIsInDarkMode()) { if (!isDarkMode()) {
// In 'Dark' mode controls are transparent, so we do not // In 'Dark' mode controls are transparent, so we do not
// over-paint the (potentially custom) color in the background. // over-paint the (potentially custom) color in the background.
// In 'Light' mode we have to care about the correct // In 'Light' mode we have to care about the correct
@ -3377,7 +3378,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
case PE_PanelLineEdit: case PE_PanelLineEdit:
{ {
const QStyleOptionFrame *panel = qstyleoption_cast<const QStyleOptionFrame *>(opt); const QStyleOptionFrame *panel = qstyleoption_cast<const QStyleOptionFrame *>(opt);
if (qt_mac_applicationIsInDarkMode() || (panel && panel->lineWidth <= 0)) { if (isDarkMode() || (panel && panel->lineWidth <= 0)) {
// QCommonStyle::drawPrimitive(PE_PanelLineEdit) fill the background with // QCommonStyle::drawPrimitive(PE_PanelLineEdit) fill the background with
// a proper color, defined in opt->palette and then, if lineWidth > 0, it // a proper color, defined in opt->palette and then, if lineWidth > 0, it
// calls QMacStyle::drawPrimitive(PE_FrameLineEdit). We use NSTextFieldCell // calls QMacStyle::drawPrimitive(PE_FrameLineEdit). We use NSTextFieldCell
@ -4594,7 +4595,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
#ifndef QT_NO_TOOLBAR #ifndef QT_NO_TOOLBAR
case CE_ToolBar: { case CE_ToolBar: {
const QStyleOptionToolBar *toolBar = qstyleoption_cast<const QStyleOptionToolBar *>(opt); const QStyleOptionToolBar *toolBar = qstyleoption_cast<const QStyleOptionToolBar *>(opt);
const bool isDarkMode = qt_mac_applicationIsInDarkMode(); const bool darkMode = isDarkMode();
// Unified title and toolbar drawing. In this mode the cocoa platform plugin will // Unified title and toolbar drawing. In this mode the cocoa platform plugin will
// fill the top toolbar area part with a background gradient that "unifies" with // fill the top toolbar area part with a background gradient that "unifies" with
@ -4619,7 +4620,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
if (isEndOfUnifiedArea) { if (isEndOfUnifiedArea) {
const int margin = qt_mac_aqua_get_metric(SeparatorSize); const int margin = qt_mac_aqua_get_metric(SeparatorSize);
const auto separatorRect = QRect(opt->rect.left(), opt->rect.bottom(), opt->rect.width(), margin); const auto separatorRect = QRect(opt->rect.left(), opt->rect.bottom(), opt->rect.width(), margin);
p->fillRect(separatorRect, isDarkMode ? darkModeSeparatorLine : opt->palette.dark().color()); p->fillRect(separatorRect, darkMode ? darkModeSeparatorLine : opt->palette.dark().color());
} }
break; break;
} }
@ -4634,24 +4635,24 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
else else
linearGrad = QLinearGradient(opt->rect.left(), 0, opt->rect.right(), 0); linearGrad = QLinearGradient(opt->rect.left(), 0, opt->rect.right(), 0);
QColor mainWindowGradientBegin = isDarkMode ? darkMainWindowGradientBegin : lightMainWindowGradientBegin; QColor mainWindowGradientBegin = darkMode ? darkMainWindowGradientBegin : lightMainWindowGradientBegin;
QColor mainWindowGradientEnd = isDarkMode ? darkMainWindowGradientEnd : lightMainWindowGradientEnd; QColor mainWindowGradientEnd = darkMode ? darkMainWindowGradientEnd : lightMainWindowGradientEnd;
linearGrad.setColorAt(0, mainWindowGradientBegin); linearGrad.setColorAt(0, mainWindowGradientBegin);
linearGrad.setColorAt(1, mainWindowGradientEnd); linearGrad.setColorAt(1, mainWindowGradientEnd);
p->fillRect(opt->rect, linearGrad); p->fillRect(opt->rect, linearGrad);
p->save(); p->save();
QRect toolbarRect = isDarkMode ? opt->rect.adjusted(0, 0, 0, 1) : opt->rect; QRect toolbarRect = darkMode ? opt->rect.adjusted(0, 0, 0, 1) : opt->rect;
if (opt->state & State_Horizontal) { if (opt->state & State_Horizontal) {
p->setPen(isDarkMode ? darkModeSeparatorLine : mainWindowGradientBegin.lighter(114)); p->setPen(darkMode ? darkModeSeparatorLine : mainWindowGradientBegin.lighter(114));
p->drawLine(toolbarRect.topLeft(), toolbarRect.topRight()); p->drawLine(toolbarRect.topLeft(), toolbarRect.topRight());
p->setPen(isDarkMode ? darkModeSeparatorLine :mainWindowGradientEnd.darker(114)); p->setPen(darkMode ? darkModeSeparatorLine :mainWindowGradientEnd.darker(114));
p->drawLine(toolbarRect.bottomLeft(), toolbarRect.bottomRight()); p->drawLine(toolbarRect.bottomLeft(), toolbarRect.bottomRight());
} else { } else {
p->setPen(isDarkMode ? darkModeSeparatorLine : mainWindowGradientBegin.lighter(114)); p->setPen(darkMode ? darkModeSeparatorLine : mainWindowGradientBegin.lighter(114));
p->drawLine(toolbarRect.topLeft(), toolbarRect.bottomLeft()); p->drawLine(toolbarRect.topLeft(), toolbarRect.bottomLeft());
p->setPen(isDarkMode ? darkModeSeparatorLine : mainWindowGradientEnd.darker(114)); p->setPen(darkMode ? darkModeSeparatorLine : mainWindowGradientEnd.darker(114));
p->drawLine(toolbarRect.topRight(), toolbarRect.bottomRight()); p->drawLine(toolbarRect.topRight(), toolbarRect.bottomRight());
} }
p->restore(); p->restore();