feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Theming: Update of color tokens

Browse Source 
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 <cristian.adam@qt.io>
This commit is contained in:
Alessandro Portale
2024-01-26 13:17:06 +01:00
parent cdef799321
commit 2c45a3ffe4
9 changed files with 78 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
share/qtcreator/themes/dark.creatortheme
View File

@@ -414,15 +414,17 @@ Token_Accent_Muted=ff1f9b5d
Token_Accent_Subtle=ff1a8550 Token_Accent_Subtle=ff1a8550
Token_Background_Default=ff1f1f1f Token_Background_Default=ff1f1f1f
Token_Background_Muted=ff262626 Token_Background_Muted=ff262626
Token_Background_Hover=ff313131 Token_Background_Subtle=ff2e2e2e
Token_Background_Subtle=ff3c3c3c Token_Foreground_Default=ff5a5a5a
Token_Text_Default=fff2f2f2 Token_Foreground_Muted=ff3e3e3e
Token_Text_Muted=ff909090 Token_Foreground_Subtle=ff303030
Token_Text_Default=fff8f8f8
Token_Text_Muted=ffaeaeae
Token_Text_Subtle=ff595959 Token_Text_Subtle=ff595959
Token_Stroke_Strong=ffeeeeee Token_Stroke_Strong=ffeeeeee
Token_Stroke_Muted=ff727272 Token_Stroke_Muted=ff727272
Token_Stroke_Subtle=ff3a3a3a Token_Stroke_Subtle=ff3a3a3a
Token_Notification_Alert=ffc98f38 Token_Notification_Alert=ffc98014
Token_Notification_Success=ff1f9b5d Token_Notification_Success=ff1f9b5d
Token_Notification_Neutral=ff016876 Token_Notification_Neutral=ff016876
Token_Notification_Danger=ffb22245 Token_Notification_Danger=ffb22245

24
share/qtcreator/themes/default.creatortheme
View File

@@ -401,19 +401,21 @@ Debugger_Breakpoint_TextMarkColor=ffff4040
; Qt Creator Color Tokens - light mode ; Qt Creator Color Tokens - light mode
Token_Basic_Black=ff131313 Token_Basic_Black=ff131313
Token_Basic_White=fff2f2f2 Token_Basic_White=fff2f2f2
Token_Accent_Default=ff28c878 Token_Accent_Default=ff23b26a
Token_Accent_Muted=ff23b26a Token_Accent_Muted=ff1f9b5d
Token_Accent_Subtle=ff1f9b5d Token_Accent_Subtle=ff1a8550
Token_Background_Default=fff4f4f4 Token_Background_Default=ffe3e3e3
Token_Background_Muted=ffe7e7e7 Token_Background_Muted=ffeeeeee
Token_Background_Hover=ffdddddd Token_Background_Subtle=fffbfbfb
Token_Background_Subtle=ffcfcfcf Token_Foreground_Default=ffcdcdcd
Token_Foreground_Muted=ffd5d5d5
Token_Foreground_Subtle=ffdddddd
Token_Text_Default=ff393939 Token_Text_Default=ff393939
Token_Text_Muted=ff787878 Token_Text_Muted=ff7c7c7c
Token_Text_Subtle=ffb2b2b2 Token_Text_Subtle=ffbebebe
Token_Stroke_Strong=ff464646 Token_Stroke_Strong=ff464646
Token_Stroke_Muted=ff838383 Token_Stroke_Muted=ff727272
Token_Stroke_Subtle=ffd7d7d7 Token_Stroke_Subtle=ffcdcdcd
Token_Notification_Alert=ffeb991f Token_Notification_Alert=ffeb991f
Token_Notification_Success=ff23b26a Token_Notification_Success=ff23b26a
Token_Notification_Neutral=ff0e7887 Token_Notification_Neutral=ff0e7887

24
share/qtcreator/themes/design-light.creatortheme
View File

@@ -413,19 +413,21 @@ Debugger_Breakpoint_TextMarkColor=ffff4040
; Qt Creator Color Tokens - light mode ; Qt Creator Color Tokens - light mode
Token_Basic_Black=ff131313 Token_Basic_Black=ff131313
Token_Basic_White=fff2f2f2 Token_Basic_White=fff2f2f2
Token_Accent_Default=ff28c878 Token_Accent_Default=ff23b26a
Token_Accent_Muted=ff23b26a Token_Accent_Muted=ff1f9b5d
Token_Accent_Subtle=ff1f9b5d Token_Accent_Subtle=ff1a8550
Token_Background_Default=fff4f4f4 Token_Background_Default=ffe3e3e3
Token_Background_Muted=ffe7e7e7 Token_Background_Muted=ffeeeeee
Token_Background_Hover=ffdddddd Token_Background_Subtle=fffbfbfb
Token_Background_Subtle=ffcfcfcf Token_Foreground_Default=ffcdcdcd
Token_Foreground_Muted=ffd5d5d5
Token_Foreground_Subtle=ffdddddd
Token_Text_Default=ff393939 Token_Text_Default=ff393939
Token_Text_Muted=ff787878 Token_Text_Muted=ff7c7c7c
Token_Text_Subtle=ffb2b2b2 Token_Text_Subtle=ffbebebe
Token_Stroke_Strong=ff464646 Token_Stroke_Strong=ff464646
Token_Stroke_Muted=ff838383 Token_Stroke_Muted=ff727272
Token_Stroke_Subtle=ffd7d7d7 Token_Stroke_Subtle=ffcdcdcd
Token_Notification_Alert=ffeb991f Token_Notification_Alert=ffeb991f
Token_Notification_Success=ff23b26a Token_Notification_Success=ff23b26a
Token_Notification_Neutral=ff0e7887 Token_Notification_Neutral=ff0e7887

12
share/qtcreator/themes/design.creatortheme
View File

@@ -422,15 +422,17 @@ Token_Accent_Muted=ff1f9b5d
Token_Accent_Subtle=ff1a8550 Token_Accent_Subtle=ff1a8550
Token_Background_Default=ff1f1f1f Token_Background_Default=ff1f1f1f
Token_Background_Muted=ff262626 Token_Background_Muted=ff262626
Token_Background_Hover=ff313131 Token_Background_Subtle=ff2e2e2e
Token_Background_Subtle=ff3c3c3c Token_Foreground_Default=ff5a5a5a
Token_Text_Default=fff2f2f2 Token_Foreground_Muted=ff3e3e3e
Token_Text_Muted=ff909090 Token_Foreground_Subtle=ff303030
Token_Text_Default=fff8f8f8
Token_Text_Muted=ffaeaeae
Token_Text_Subtle=ff595959 Token_Text_Subtle=ff595959
Token_Stroke_Strong=ffeeeeee Token_Stroke_Strong=ffeeeeee
Token_Stroke_Muted=ff727272 Token_Stroke_Muted=ff727272
Token_Stroke_Subtle=ff3a3a3a Token_Stroke_Subtle=ff3a3a3a
Token_Notification_Alert=ffc98f38 Token_Notification_Alert=ffc98014
Token_Notification_Success=ff1f9b5d Token_Notification_Success=ff1f9b5d
Token_Notification_Neutral=ff016876 Token_Notification_Neutral=ff016876
Token_Notification_Danger=ffb22245 Token_Notification_Danger=ffb22245

12
share/qtcreator/themes/flat-dark.creatortheme
View File

@@ -418,15 +418,17 @@ Token_Accent_Muted=ff1f9b5d
Token_Accent_Subtle=ff1a8550 Token_Accent_Subtle=ff1a8550
Token_Background_Default=ff1f1f1f Token_Background_Default=ff1f1f1f
Token_Background_Muted=ff262626 Token_Background_Muted=ff262626
Token_Background_Hover=ff313131 Token_Background_Subtle=ff2e2e2e
Token_Background_Subtle=ff3c3c3c Token_Foreground_Default=ff5a5a5a
Token_Text_Default=fff2f2f2 Token_Foreground_Muted=ff3e3e3e
Token_Text_Muted=ff909090 Token_Foreground_Subtle=ff303030
Token_Text_Default=fff8f8f8
Token_Text_Muted=ffaeaeae
Token_Text_Subtle=ff595959 Token_Text_Subtle=ff595959
Token_Stroke_Strong=ffeeeeee Token_Stroke_Strong=ffeeeeee
Token_Stroke_Muted=ff727272 Token_Stroke_Muted=ff727272
Token_Stroke_Subtle=ff3a3a3a Token_Stroke_Subtle=ff3a3a3a
Token_Notification_Alert=ffc98f38 Token_Notification_Alert=ffc98014
Token_Notification_Success=ff1f9b5d Token_Notification_Success=ff1f9b5d
Token_Notification_Neutral=ff016876 Token_Notification_Neutral=ff016876
Token_Notification_Danger=ffb22245 Token_Notification_Danger=ffb22245

24
share/qtcreator/themes/flat-light.creatortheme
View File

@@ -410,19 +410,21 @@ Debugger_Breakpoint_TextMarkColor=ffff4040
; Qt Creator Color Tokens - light mode ; Qt Creator Color Tokens - light mode
Token_Basic_Black=ff131313 Token_Basic_Black=ff131313
Token_Basic_White=fff2f2f2 Token_Basic_White=fff2f2f2
Token_Accent_Default=ff28c878 Token_Accent_Default=ff23b26a
Token_Accent_Muted=ff23b26a Token_Accent_Muted=ff1f9b5d
Token_Accent_Subtle=ff1f9b5d Token_Accent_Subtle=ff1a8550
Token_Background_Default=fff4f4f4 Token_Background_Default=ffe3e3e3
Token_Background_Muted=ffe7e7e7 Token_Background_Muted=ffeeeeee
Token_Background_Hover=ffdddddd Token_Background_Subtle=fffbfbfb
Token_Background_Subtle=ffcfcfcf Token_Foreground_Default=ffcdcdcd
Token_Foreground_Muted=ffd5d5d5
Token_Foreground_Subtle=ffdddddd
Token_Text_Default=ff393939 Token_Text_Default=ff393939
Token_Text_Muted=ff787878 Token_Text_Muted=ff7c7c7c
Token_Text_Subtle=ffb2b2b2 Token_Text_Subtle=ffbebebe
Token_Stroke_Strong=ff464646 Token_Stroke_Strong=ff464646
Token_Stroke_Muted=ff838383 Token_Stroke_Muted=ff727272
Token_Stroke_Subtle=ffd7d7d7 Token_Stroke_Subtle=ffcdcdcd
Token_Notification_Alert=ffeb991f Token_Notification_Alert=ffeb991f
Token_Notification_Success=ff23b26a Token_Notification_Success=ff23b26a
Token_Notification_Neutral=ff0e7887 Token_Notification_Neutral=ff0e7887

24
share/qtcreator/themes/flat.creatortheme
View File

@@ -408,19 +408,21 @@ Debugger_Breakpoint_TextMarkColor=ffff4040
; Qt Creator Color Tokens - light mode ; Qt Creator Color Tokens - light mode
Token_Basic_Black=ff131313 Token_Basic_Black=ff131313
Token_Basic_White=fff2f2f2 Token_Basic_White=fff2f2f2
Token_Accent_Default=ff28c878 Token_Accent_Default=ff23b26a
Token_Accent_Muted=ff23b26a Token_Accent_Muted=ff1f9b5d
Token_Accent_Subtle=ff1f9b5d Token_Accent_Subtle=ff1a8550
Token_Background_Default=fff4f4f4 Token_Background_Default=ffe3e3e3
Token_Background_Muted=ffe7e7e7 Token_Background_Muted=ffeeeeee
Token_Background_Hover=ffdddddd Token_Background_Subtle=fffbfbfb
Token_Background_Subtle=ffcfcfcf Token_Foreground_Default=ffcdcdcd
Token_Foreground_Muted=ffd5d5d5
Token_Foreground_Subtle=ffdddddd
Token_Text_Default=ff393939 Token_Text_Default=ff393939
Token_Text_Muted=ff787878 Token_Text_Muted=ff7c7c7c
Token_Text_Subtle=ffb2b2b2 Token_Text_Subtle=ffbebebe
Token_Stroke_Strong=ff464646 Token_Stroke_Strong=ff464646
Token_Stroke_Muted=ff838383 Token_Stroke_Muted=ff727272
Token_Stroke_Subtle=ffd7d7d7 Token_Stroke_Subtle=ffcdcdcd
Token_Notification_Alert=ffeb991f Token_Notification_Alert=ffeb991f
Token_Notification_Success=ff23b26a Token_Notification_Success=ff23b26a
Token_Notification_Neutral=ff0e7887 Token_Notification_Neutral=ff0e7887

4
src/libs/utils/theme/theme.h
View File

@@ -232,8 +232,10 @@ public:
Token_Accent_Subtle, Token_Accent_Subtle,
Token_Background_Default, Token_Background_Default,
Token_Background_Muted, Token_Background_Muted,
Token_Background_Hover,
Token_Background_Subtle, Token_Background_Subtle,
Token_Foreground_Default,
Token_Foreground_Muted,
Token_Foreground_Subtle,
Token_Text_Default, Token_Text_Default,
Token_Text_Muted, Token_Text_Muted,
Token_Text_Subtle, Token_Text_Subtle,

4
src/plugins/extensionmanager/extensionsbrowser.cpp
View File

@@ -345,7 +345,7 @@ public:
constexpr qreal rounding = 4.5; constexpr qreal rounding = 4.5;
QPainterPath itemOutlinePath; QPainterPath itemOutlinePath;
itemOutlinePath.addRoundedRect(itemRectAdjusted, rounding, rounding); 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); : Theme::Token_Background_Muted);
const QColor strokeColor = creatorTheme()->color(selected ? Theme::Token_Stroke_Strong const QColor strokeColor = creatorTheme()->color(selected ? Theme::Token_Stroke_Strong
: Theme::Token_Stroke_Subtle); : Theme::Token_Stroke_Subtle);
@@ -384,7 +384,7 @@ public:
constexpr QRectF smallCircleAdjusted = smallCircle.adjusted(shrink, shrink, constexpr QRectF smallCircleAdjusted = smallCircle.adjusted(shrink, shrink,
-shrink, -shrink); -shrink, -shrink);
const QRectF smallCircleLocal = smallCircleAdjusted.translated(itemRect.topLeft()); 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); const QColor strokeColor = creatorTheme()->color(Theme::Token_Stroke_Subtle);
painter->setBrush(fillColor); painter->setBrush(fillColor);
painter->setPen(strokeColor); painter->setPen(strokeColor);