From 5ced0731f0126277f0c73d385d5c359c85e2ee6c Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 17 Oct 2024 18:23:55 +0200 Subject: [PATCH] Themes: Make QPalette::Accent overridable by themes QPalette::Accent was added in Qt 6, and missing in Qt Creator's support for palette overriding. This change adds the respective theme roles and lets the new themes set them with Token_Accent/_Subtle. Change-Id: Ieefc8369b3f7050e5d96c1922ad753bcbbfd719e Reviewed-by: Marcus Tillmanns --- share/qtcreator/themes/broccoli.tokenmapping | 2 ++ src/libs/utils/theme/theme.cpp | 2 ++ src/libs/utils/theme/theme.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/share/qtcreator/themes/broccoli.tokenmapping b/share/qtcreator/themes/broccoli.tokenmapping index 8071a2c42c9..8dd10c7e9aa 100644 --- a/share/qtcreator/themes/broccoli.tokenmapping +++ b/share/qtcreator/themes/broccoli.tokenmapping @@ -47,6 +47,8 @@ MenuItemTextColorNormal=Token_Text_Default MiniProjectTargetSelectorTextColor=Token_Text_Muted OutputPaneToggleButtonTextColorChecked=Token_Text_Muted OutputPaneToggleButtonTextColorUnchecked=Token_Text_Muted +PaletteAccent=Token_Accent_Default +PaletteAccentDisabled=Token_Accent_Subtle PaletteAlternateBase=Token_Background_Muted PaletteAlternateBaseDisabled=Token_Background_Subtle PaletteBase=Token_Background_Default diff --git a/src/libs/utils/theme/theme.cpp b/src/libs/utils/theme/theme.cpp index c5b2665cc0c..b6467a0ce77 100644 --- a/src/libs/utils/theme/theme.cpp +++ b/src/libs/utils/theme/theme.cpp @@ -453,6 +453,8 @@ QPalette Theme::palette() const {PaletteShadowDisabled, QPalette::Shadow, QPalette::Disabled, false}, {PalettePlaceholderText, QPalette::PlaceholderText, QPalette::All, false}, {PalettePlaceholderTextDisabled, QPalette::PlaceholderText, QPalette::Disabled, false}, + {PaletteAccent, QPalette::Accent, QPalette::All, false}, + {PaletteAccentDisabled, QPalette::Accent, QPalette::Disabled, false}, }; for (auto entry: mapping) { diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index 0f44bd5dfe9..b2459b445f1 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -128,6 +128,8 @@ public: PalettePlaceholderText, PalettePlaceholderTextDisabled, + PaletteAccent, + PaletteAccentDisabled, /* Icons */