summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2020-12-29 14:36:04 +0200
committerJaakko Keränen <jaakko.keranen@iki.fi>2020-12-29 14:36:04 +0200
commit6f1e31fdadd22a5f6932e87eab15fabd5e5cb1df (patch)
tree84a02425469799311908e55e52ceceee0846a346
parente7ebb78eb7c04a8c973218f9b5048bc009a444a7 (diff)
SidebarWidget: Finetuning the secondary item colors
-rw-r--r--src/ui/color.c4
-rw-r--r--src/ui/color.h1
-rw-r--r--src/ui/sidebarwidget.c4
3 files changed, 7 insertions, 2 deletions
diff --git a/src/ui/color.c b/src/ui/color.c
index 8233818e..1bab8538 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -82,6 +82,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
82 copy_(uiText_ColorId, gray75_ColorId); 82 copy_(uiText_ColorId, gray75_ColorId);
83 copy_(uiTextPressed_ColorId, black_ColorId); 83 copy_(uiTextPressed_ColorId, black_ColorId);
84 copy_(uiTextStrong_ColorId, white_ColorId); 84 copy_(uiTextStrong_ColorId, white_ColorId);
85 copy_(uiTextDim_ColorId, gray75_ColorId);
85 copy_(uiTextSelected_ColorId, white_ColorId); 86 copy_(uiTextSelected_ColorId, white_ColorId);
86 copy_(uiTextFramelessHover_ColorId, white_ColorId); 87 copy_(uiTextFramelessHover_ColorId, white_ColorId);
87 copy_(uiTextDisabled_ColorId, gray25_ColorId); 88 copy_(uiTextDisabled_ColorId, gray25_ColorId);
@@ -126,6 +127,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
126 copy_(uiText_ColorId, gray75_ColorId); 127 copy_(uiText_ColorId, gray75_ColorId);
127 copy_(uiTextPressed_ColorId, black_ColorId); 128 copy_(uiTextPressed_ColorId, black_ColorId);
128 copy_(uiTextStrong_ColorId, white_ColorId); 129 copy_(uiTextStrong_ColorId, white_ColorId);
130 copy_(uiTextDim_ColorId, gray75_ColorId);
129 copy_(uiTextSelected_ColorId, white_ColorId); 131 copy_(uiTextSelected_ColorId, white_ColorId);
130 copy_(uiTextDisabled_ColorId, gray50_ColorId); 132 copy_(uiTextDisabled_ColorId, gray50_ColorId);
131 copy_(uiTextFramelessHover_ColorId, white_ColorId); 133 copy_(uiTextFramelessHover_ColorId, white_ColorId);
@@ -168,6 +170,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
168 copy_(uiBackgroundFramelessHover_ColorId, orange_ColorId); 170 copy_(uiBackgroundFramelessHover_ColorId, orange_ColorId);
169 copy_(uiText_ColorId, black_ColorId); 171 copy_(uiText_ColorId, black_ColorId);
170 copy_(uiTextStrong_ColorId, black_ColorId); 172 copy_(uiTextStrong_ColorId, black_ColorId);
173 copy_(uiTextDim_ColorId, gray25_ColorId);
171 copy_(uiTextPressed_ColorId, black_ColorId); 174 copy_(uiTextPressed_ColorId, black_ColorId);
172 copy_(uiTextSelected_ColorId, black_ColorId); 175 copy_(uiTextSelected_ColorId, black_ColorId);
173 copy_(uiTextDisabled_ColorId, gray50_ColorId); 176 copy_(uiTextDisabled_ColorId, gray50_ColorId);
@@ -213,6 +216,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
213 copy_(uiTextPressed_ColorId, black_ColorId); 216 copy_(uiTextPressed_ColorId, black_ColorId);
214 copy_(uiTextDisabled_ColorId, gray75_ColorId); 217 copy_(uiTextDisabled_ColorId, gray75_ColorId);
215 copy_(uiTextStrong_ColorId, black_ColorId); 218 copy_(uiTextStrong_ColorId, black_ColorId);
219 copy_(uiTextDim_ColorId, gray25_ColorId);
216 copy_(uiTextSelected_ColorId, black_ColorId); 220 copy_(uiTextSelected_ColorId, black_ColorId);
217 copy_(uiTextFramelessHover_ColorId, black_ColorId); 221 copy_(uiTextFramelessHover_ColorId, black_ColorId);
218 copy_(uiTextShortcut_ColorId, brown_ColorId); 222 copy_(uiTextShortcut_ColorId, brown_ColorId);
diff --git a/src/ui/color.h b/src/ui/color.h
index bc2f04f6..61da37c0 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -103,6 +103,7 @@ enum iColorId {
103 uiMarked_ColorId, 103 uiMarked_ColorId,
104 uiMatching_ColorId, 104 uiMatching_ColorId,
105 uiBackgroundUnfocusedSelection_ColorId, 105 uiBackgroundUnfocusedSelection_ColorId,
106 uiTextDim_ColorId,
106 107
107 /* content theme colors */ 108 /* content theme colors */
108 tmFirst_ColorId, 109 tmFirst_ColorId,
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 6bd51731..317e74bd 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -1284,7 +1284,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
1284 } 1284 }
1285 else { 1285 else {
1286 const int fg = isHover ? (isPressing ? uiTextPressed_ColorId : uiTextFramelessHover_ColorId) 1286 const int fg = isHover ? (isPressing ? uiTextPressed_ColorId : uiTextFramelessHover_ColorId)
1287 : uiHeading_ColorId; 1287 : uiTextDim_ColorId;
1288 iUrl parts; 1288 iUrl parts;
1289 init_Url(&parts, &d->label); 1289 init_Url(&parts, &d->label);
1290 const iBool isAbout = equalCase_Rangecc(parts.scheme, "about"); 1290 const iBool isAbout = equalCase_Rangecc(parts.scheme, "about");
@@ -1317,7 +1317,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
1317 2)); 1317 2));
1318 const int metaFg = isHover ? permanent_ColorId | (isPressing ? uiTextPressed_ColorId 1318 const int metaFg = isHover ? permanent_ColorId | (isPressing ? uiTextPressed_ColorId
1319 : uiTextFramelessHover_ColorId) 1319 : uiTextFramelessHover_ColorId)
1320 : uiText_ColorId; 1320 : uiTextDim_ColorId;
1321 drawRange_Text( 1321 drawRange_Text(
1322 font, cPos, d->listItem.isSelected ? iconColor : metaFg, range_String(&icon)); 1322 font, cPos, d->listItem.isSelected ? iconColor : metaFg, range_String(&icon));
1323 deinit_String(&icon); 1323 deinit_String(&icon);