diff options
| -rw-r--r-- | share/qtcreator/themes/dark.creatortheme | 4 | ||||
| -rw-r--r-- | src/libs/utils/theme/theme.cpp | 5 | ||||
| -rw-r--r-- | src/libs/utils/theme/theme_p.h | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 5f721a548d..82fa00f614 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -2,6 +2,7 @@ ThemeName=Dark PreferredStyles= DefaultTextEditorColorScheme=dark.xml +EnforceAccentColorOnMacOS=selectedBackground [Palette] shadowBackground=ff232323 @@ -10,7 +11,6 @@ textDisabled=7fffffff textHighlighted=ffe7e7e7 hoverBackground=18ffffff selectedBackground=aa1f75cc -selectedBackgroundText=aa1f75cc normalBackground=ff333333 alternateBackground=ff515151 error=ffd84044 @@ -358,7 +358,7 @@ PaletteText=text PaletteButtonText=text PaletteButtonTextDisabled=textDisabled PaletteToolTipBase=66000000 -PaletteHighlight=selectedBackgroundText +PaletteHighlight=selectedBackground PaletteDark=shadowBackground PaletteHighlightedText=textHighlighted PaletteToolTipText=text 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<QPair<QColor, QString> > colors; QVector<QString> imageFiles; QVector<bool> flags; |