From 33a33612c8ff92bb541d76cb338675f16beb4281 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 10 Nov 2022 09:23:06 +0100 Subject: Theme 'dark': Use accent color on macOS Fixes: QTCREATORBUG-28374 Change-Id: Ifb7fa83c8afc1be0a919c775f7d04e229f146438 Reviewed-by: Orgad Shaneh Reviewed-by: Reviewed-by: Christian Stenger --- src/libs/utils/theme/theme.cpp | 5 +++++ src/libs/utils/theme/theme_p.h | 1 + 2 files changed, 6 insertions(+) (limited to 'src') diff --git a/src/libs/utils/theme/theme.cpp b/src/libs/utils/theme/theme.cpp index 54676b709c..788237e4e1 100644 --- a/src/libs/utils/theme/theme.cpp +++ b/src/libs/utils/theme/theme.cpp @@ -120,6 +120,10 @@ bool Theme::flag(Theme::Flag f) const QColor Theme::color(Theme::Color role) const { + const auto color = d->colors[role]; + if (HostOsInfo::isMacHost() && !d->enforceAccentColorOnMacOS.isEmpty() + && color.second == d->enforceAccentColorOnMacOS) + return initialPalette().color(QPalette::Highlight); return d->colors[role].first; } @@ -171,6 +175,7 @@ void Theme::readSettings(QSettings &settings) d->preferredStyles.removeAll(QString()); d->defaultTextEditorColorScheme = settings.value(QLatin1String("DefaultTextEditorColorScheme")).toString(); + d->enforceAccentColorOnMacOS = settings.value("EnforceAccentColorOnMacOS").toString(); } { settings.beginGroup(QLatin1String("Palette")); diff --git a/src/libs/utils/theme/theme_p.h b/src/libs/utils/theme/theme_p.h index e3ec90e186..f8842cd5d0 100644 --- a/src/libs/utils/theme/theme_p.h +++ b/src/libs/utils/theme/theme_p.h @@ -22,6 +22,7 @@ public: QString displayName; QStringList preferredStyles; QString defaultTextEditorColorScheme; + QString enforceAccentColorOnMacOS; QVector > colors; QVector imageFiles; QVector flags; -- cgit v1.2.1