diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-08-03 06:58:38 +0300 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-08-03 06:58:38 +0300 |
commit | 232da2f992013ea80976f55a2f45f55202917478 (patch) | |
tree | 88f84dac41a4b19f2970df7ad77122d8357c8145 /src/ui/color.c | |
parent | ea78e88f58e7198d9aa1ab4e84e4995e05625b4a (diff) |
InputWidget: Slower blink; adjusted colors
Slowed down the cursor blinking by half. Adjusted the focused input widget colors to be less harsh in dark mode.
Diffstat (limited to 'src/ui/color.c')
-rw-r--r-- | src/ui/color.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ui/color.c b/src/ui/color.c index 05ec1f6f..656de6f0 100644 --- a/src/ui/color.c +++ b/src/ui/color.c | |||
@@ -85,6 +85,7 @@ void setThemePalette_Color(enum iColorTheme theme) { | |||
85 | const int accentLo = (prefs->accent == cyan_ColorAccent ? teal_ColorId : brown_ColorId); | 85 | const int accentLo = (prefs->accent == cyan_ColorAccent ? teal_ColorId : brown_ColorId); |
86 | const int altAccentHi = (prefs->accent == cyan_ColorAccent ? orange_ColorId : cyan_ColorId); | 86 | const int altAccentHi = (prefs->accent == cyan_ColorAccent ? orange_ColorId : cyan_ColorId); |
87 | const int altAccentLo = (prefs->accent == cyan_ColorAccent ? brown_ColorId : teal_ColorId); | 87 | const int altAccentLo = (prefs->accent == cyan_ColorAccent ? brown_ColorId : teal_ColorId); |
88 | const iColor altAccentMid = mix_Color(get_Color(altAccentHi), get_Color(altAccentLo), 0.5f); | ||
88 | switch (theme) { | 89 | switch (theme) { |
89 | case pureBlack_ColorTheme: { | 90 | case pureBlack_ColorTheme: { |
90 | copy_(uiBackground_ColorId, black_ColorId); | 91 | copy_(uiBackground_ColorId, black_ColorId); |
@@ -123,7 +124,7 @@ void setThemePalette_Color(enum iColorTheme theme) { | |||
123 | copy_(uiInputTextFocused_ColorId, white_ColorId); | 124 | copy_(uiInputTextFocused_ColorId, white_ColorId); |
124 | copy_(uiInputFrame_ColorId, gray25_ColorId); | 125 | copy_(uiInputFrame_ColorId, gray25_ColorId); |
125 | copy_(uiInputFrameHover_ColorId, accentHi); | 126 | copy_(uiInputFrameHover_ColorId, accentHi); |
126 | copy_(uiInputFrameFocused_ColorId, altAccentHi); | 127 | set_Color(uiInputFrameFocused_ColorId, altAccentMid); |
127 | copy_(uiInputCursor_ColorId, altAccentHi); | 128 | copy_(uiInputCursor_ColorId, altAccentHi); |
128 | copy_(uiInputCursorText_ColorId, black_ColorId); | 129 | copy_(uiInputCursorText_ColorId, black_ColorId); |
129 | copy_(uiHeading_ColorId, accentHi); | 130 | copy_(uiHeading_ColorId, accentHi); |
@@ -171,10 +172,12 @@ void setThemePalette_Color(enum iColorTheme theme) { | |||
171 | mix_Color(get_Color(black_ColorId), get_Color(gray25_ColorId), 0.7f)); | 172 | mix_Color(get_Color(black_ColorId), get_Color(gray25_ColorId), 0.7f)); |
172 | copy_(uiInputBackgroundFocused_ColorId, black_ColorId); | 173 | copy_(uiInputBackgroundFocused_ColorId, black_ColorId); |
173 | copy_(uiInputText_ColorId, gray75_ColorId); | 174 | copy_(uiInputText_ColorId, gray75_ColorId); |
174 | copy_(uiInputTextFocused_ColorId, white_ColorId); | 175 | //copy_(uiInputTextFocused_ColorId, white_ColorId); |
176 | set_Color(uiInputTextFocused_ColorId, mix_Color(get_Color(white_ColorId), | ||
177 | get_Color(altAccentHi), 0.15f)); | ||
175 | copy_(uiInputFrame_ColorId, uiInputBackground_ColorId); | 178 | copy_(uiInputFrame_ColorId, uiInputBackground_ColorId); |
176 | copy_(uiInputFrameHover_ColorId, accentHi); | 179 | copy_(uiInputFrameHover_ColorId, accentHi); |
177 | copy_(uiInputFrameFocused_ColorId, altAccentHi); | 180 | set_Color(uiInputFrameFocused_ColorId, altAccentMid); |
178 | copy_(uiInputCursor_ColorId, altAccentHi); | 181 | copy_(uiInputCursor_ColorId, altAccentHi); |
179 | copy_(uiInputCursorText_ColorId, black_ColorId); | 182 | copy_(uiInputCursorText_ColorId, black_ColorId); |
180 | copy_(uiHeading_ColorId, accentHi); | 183 | copy_(uiHeading_ColorId, accentHi); |