From 2c45a3ffe43fafb370b6d8dcc2f4fb39dfda5ac2 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 26 Jan 2024 13:17:06 +0100 Subject: [PATCH] Theming: Update of color tokens Token_Background_Hover is gone. Token_Foreground_Default, Token_Foreground_Muted and Token_Foreground_Subtle were added. Existing token colors were changed. Change-Id: I9505ee54dd02f78bd722c0dcfe42ee6ae4e48d13 Reviewed-by: Cristian Adam --- share/qtcreator/themes/dark.creatortheme | 12 ++++++---- share/qtcreator/themes/default.creatortheme | 24 ++++++++++--------- .../themes/design-light.creatortheme | 24 ++++++++++--------- share/qtcreator/themes/design.creatortheme | 12 ++++++---- share/qtcreator/themes/flat-dark.creatortheme | 12 ++++++---- .../qtcreator/themes/flat-light.creatortheme | 24 ++++++++++--------- share/qtcreator/themes/flat.creatortheme | 24 ++++++++++--------- src/libs/utils/theme/theme.h | 4 +++- .../extensionmanager/extensionsbrowser.cpp | 4 ++-- 9 files changed, 78 insertions(+), 62 deletions(-) diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index a7d1a01b7f7..a7dcedd104a 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -414,15 +414,17 @@ Token_Accent_Muted=ff1f9b5d Token_Accent_Subtle=ff1a8550 Token_Background_Default=ff1f1f1f Token_Background_Muted=ff262626 -Token_Background_Hover=ff313131 -Token_Background_Subtle=ff3c3c3c -Token_Text_Default=fff2f2f2 -Token_Text_Muted=ff909090 +Token_Background_Subtle=ff2e2e2e +Token_Foreground_Default=ff5a5a5a +Token_Foreground_Muted=ff3e3e3e +Token_Foreground_Subtle=ff303030 +Token_Text_Default=fff8f8f8 +Token_Text_Muted=ffaeaeae Token_Text_Subtle=ff595959 Token_Stroke_Strong=ffeeeeee Token_Stroke_Muted=ff727272 Token_Stroke_Subtle=ff3a3a3a -Token_Notification_Alert=ffc98f38 +Token_Notification_Alert=ffc98014 Token_Notification_Success=ff1f9b5d Token_Notification_Neutral=ff016876 Token_Notification_Danger=ffb22245 diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index 2dcc92d0b3d..2dee7ab2469 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -401,19 +401,21 @@ Debugger_Breakpoint_TextMarkColor=ffff4040 ; Qt Creator Color Tokens - light mode Token_Basic_Black=ff131313 Token_Basic_White=fff2f2f2 -Token_Accent_Default=ff28c878 -Token_Accent_Muted=ff23b26a -Token_Accent_Subtle=ff1f9b5d -Token_Background_Default=fff4f4f4 -Token_Background_Muted=ffe7e7e7 -Token_Background_Hover=ffdddddd -Token_Background_Subtle=ffcfcfcf +Token_Accent_Default=ff23b26a +Token_Accent_Muted=ff1f9b5d +Token_Accent_Subtle=ff1a8550 +Token_Background_Default=ffe3e3e3 +Token_Background_Muted=ffeeeeee +Token_Background_Subtle=fffbfbfb +Token_Foreground_Default=ffcdcdcd +Token_Foreground_Muted=ffd5d5d5 +Token_Foreground_Subtle=ffdddddd Token_Text_Default=ff393939 -Token_Text_Muted=ff787878 -Token_Text_Subtle=ffb2b2b2 +Token_Text_Muted=ff7c7c7c +Token_Text_Subtle=ffbebebe Token_Stroke_Strong=ff464646 -Token_Stroke_Muted=ff838383 -Token_Stroke_Subtle=ffd7d7d7 +Token_Stroke_Muted=ff727272 +Token_Stroke_Subtle=ffcdcdcd Token_Notification_Alert=ffeb991f Token_Notification_Success=ff23b26a Token_Notification_Neutral=ff0e7887 diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme index 346cc09cf72..8931b620424 100644 --- a/share/qtcreator/themes/design-light.creatortheme +++ b/share/qtcreator/themes/design-light.creatortheme @@ -413,19 +413,21 @@ Debugger_Breakpoint_TextMarkColor=ffff4040 ; Qt Creator Color Tokens - light mode Token_Basic_Black=ff131313 Token_Basic_White=fff2f2f2 -Token_Accent_Default=ff28c878 -Token_Accent_Muted=ff23b26a -Token_Accent_Subtle=ff1f9b5d -Token_Background_Default=fff4f4f4 -Token_Background_Muted=ffe7e7e7 -Token_Background_Hover=ffdddddd -Token_Background_Subtle=ffcfcfcf +Token_Accent_Default=ff23b26a +Token_Accent_Muted=ff1f9b5d +Token_Accent_Subtle=ff1a8550 +Token_Background_Default=ffe3e3e3 +Token_Background_Muted=ffeeeeee +Token_Background_Subtle=fffbfbfb +Token_Foreground_Default=ffcdcdcd +Token_Foreground_Muted=ffd5d5d5 +Token_Foreground_Subtle=ffdddddd Token_Text_Default=ff393939 -Token_Text_Muted=ff787878 -Token_Text_Subtle=ffb2b2b2 +Token_Text_Muted=ff7c7c7c +Token_Text_Subtle=ffbebebe Token_Stroke_Strong=ff464646 -Token_Stroke_Muted=ff838383 -Token_Stroke_Subtle=ffd7d7d7 +Token_Stroke_Muted=ff727272 +Token_Stroke_Subtle=ffcdcdcd Token_Notification_Alert=ffeb991f Token_Notification_Success=ff23b26a Token_Notification_Neutral=ff0e7887 diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme index 1e4bdf44198..e29240a3cf6 100644 --- a/share/qtcreator/themes/design.creatortheme +++ b/share/qtcreator/themes/design.creatortheme @@ -422,15 +422,17 @@ Token_Accent_Muted=ff1f9b5d Token_Accent_Subtle=ff1a8550 Token_Background_Default=ff1f1f1f Token_Background_Muted=ff262626 -Token_Background_Hover=ff313131 -Token_Background_Subtle=ff3c3c3c -Token_Text_Default=fff2f2f2 -Token_Text_Muted=ff909090 +Token_Background_Subtle=ff2e2e2e +Token_Foreground_Default=ff5a5a5a +Token_Foreground_Muted=ff3e3e3e +Token_Foreground_Subtle=ff303030 +Token_Text_Default=fff8f8f8 +Token_Text_Muted=ffaeaeae Token_Text_Subtle=ff595959 Token_Stroke_Strong=ffeeeeee Token_Stroke_Muted=ff727272 Token_Stroke_Subtle=ff3a3a3a -Token_Notification_Alert=ffc98f38 +Token_Notification_Alert=ffc98014 Token_Notification_Success=ff1f9b5d Token_Notification_Neutral=ff016876 Token_Notification_Danger=ffb22245 diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index 525141c0a23..7e94645b743 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -418,15 +418,17 @@ Token_Accent_Muted=ff1f9b5d Token_Accent_Subtle=ff1a8550 Token_Background_Default=ff1f1f1f Token_Background_Muted=ff262626 -Token_Background_Hover=ff313131 -Token_Background_Subtle=ff3c3c3c -Token_Text_Default=fff2f2f2 -Token_Text_Muted=ff909090 +Token_Background_Subtle=ff2e2e2e +Token_Foreground_Default=ff5a5a5a +Token_Foreground_Muted=ff3e3e3e +Token_Foreground_Subtle=ff303030 +Token_Text_Default=fff8f8f8 +Token_Text_Muted=ffaeaeae Token_Text_Subtle=ff595959 Token_Stroke_Strong=ffeeeeee Token_Stroke_Muted=ff727272 Token_Stroke_Subtle=ff3a3a3a -Token_Notification_Alert=ffc98f38 +Token_Notification_Alert=ffc98014 Token_Notification_Success=ff1f9b5d Token_Notification_Neutral=ff016876 Token_Notification_Danger=ffb22245 diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index 973dd977eff..eddf38971d2 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -410,19 +410,21 @@ Debugger_Breakpoint_TextMarkColor=ffff4040 ; Qt Creator Color Tokens - light mode Token_Basic_Black=ff131313 Token_Basic_White=fff2f2f2 -Token_Accent_Default=ff28c878 -Token_Accent_Muted=ff23b26a -Token_Accent_Subtle=ff1f9b5d -Token_Background_Default=fff4f4f4 -Token_Background_Muted=ffe7e7e7 -Token_Background_Hover=ffdddddd -Token_Background_Subtle=ffcfcfcf +Token_Accent_Default=ff23b26a +Token_Accent_Muted=ff1f9b5d +Token_Accent_Subtle=ff1a8550 +Token_Background_Default=ffe3e3e3 +Token_Background_Muted=ffeeeeee +Token_Background_Subtle=fffbfbfb +Token_Foreground_Default=ffcdcdcd +Token_Foreground_Muted=ffd5d5d5 +Token_Foreground_Subtle=ffdddddd Token_Text_Default=ff393939 -Token_Text_Muted=ff787878 -Token_Text_Subtle=ffb2b2b2 +Token_Text_Muted=ff7c7c7c +Token_Text_Subtle=ffbebebe Token_Stroke_Strong=ff464646 -Token_Stroke_Muted=ff838383 -Token_Stroke_Subtle=ffd7d7d7 +Token_Stroke_Muted=ff727272 +Token_Stroke_Subtle=ffcdcdcd Token_Notification_Alert=ffeb991f Token_Notification_Success=ff23b26a Token_Notification_Neutral=ff0e7887 diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index b9d57f78784..08697334f40 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -408,19 +408,21 @@ Debugger_Breakpoint_TextMarkColor=ffff4040 ; Qt Creator Color Tokens - light mode Token_Basic_Black=ff131313 Token_Basic_White=fff2f2f2 -Token_Accent_Default=ff28c878 -Token_Accent_Muted=ff23b26a -Token_Accent_Subtle=ff1f9b5d -Token_Background_Default=fff4f4f4 -Token_Background_Muted=ffe7e7e7 -Token_Background_Hover=ffdddddd -Token_Background_Subtle=ffcfcfcf +Token_Accent_Default=ff23b26a +Token_Accent_Muted=ff1f9b5d +Token_Accent_Subtle=ff1a8550 +Token_Background_Default=ffe3e3e3 +Token_Background_Muted=ffeeeeee +Token_Background_Subtle=fffbfbfb +Token_Foreground_Default=ffcdcdcd +Token_Foreground_Muted=ffd5d5d5 +Token_Foreground_Subtle=ffdddddd Token_Text_Default=ff393939 -Token_Text_Muted=ff787878 -Token_Text_Subtle=ffb2b2b2 +Token_Text_Muted=ff7c7c7c +Token_Text_Subtle=ffbebebe Token_Stroke_Strong=ff464646 -Token_Stroke_Muted=ff838383 -Token_Stroke_Subtle=ffd7d7d7 +Token_Stroke_Muted=ff727272 +Token_Stroke_Subtle=ffcdcdcd Token_Notification_Alert=ffeb991f Token_Notification_Success=ff23b26a Token_Notification_Neutral=ff0e7887 diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index 2b3e8c80e16..605c165024e 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -232,8 +232,10 @@ public: Token_Accent_Subtle, Token_Background_Default, Token_Background_Muted, - Token_Background_Hover, Token_Background_Subtle, + Token_Foreground_Default, + Token_Foreground_Muted, + Token_Foreground_Subtle, Token_Text_Default, Token_Text_Muted, Token_Text_Subtle, diff --git a/src/plugins/extensionmanager/extensionsbrowser.cpp b/src/plugins/extensionmanager/extensionsbrowser.cpp index c225fe25c31..0e4b6ce9865 100644 --- a/src/plugins/extensionmanager/extensionsbrowser.cpp +++ b/src/plugins/extensionmanager/extensionsbrowser.cpp @@ -345,7 +345,7 @@ public: constexpr qreal rounding = 4.5; QPainterPath itemOutlinePath; itemOutlinePath.addRoundedRect(itemRectAdjusted, rounding, rounding); - const QColor fillColor = creatorTheme()->color(hovered ? Theme::Token_Background_Hover + const QColor fillColor = creatorTheme()->color(hovered ? Theme::Token_Foreground_Muted : Theme::Token_Background_Muted); const QColor strokeColor = creatorTheme()->color(selected ? Theme::Token_Stroke_Strong : Theme::Token_Stroke_Subtle); @@ -384,7 +384,7 @@ public: constexpr QRectF smallCircleAdjusted = smallCircle.adjusted(shrink, shrink, -shrink, -shrink); const QRectF smallCircleLocal = smallCircleAdjusted.translated(itemRect.topLeft()); - const QColor fillColor = creatorTheme()->color(Theme::Token_Background_Hover); + const QColor fillColor = creatorTheme()->color(Theme::Token_Foreground_Muted); const QColor strokeColor = creatorTheme()->color(Theme::Token_Stroke_Subtle); painter->setBrush(fillColor); painter->setPen(strokeColor);