From 0fc3e53d98495c2f60a280e043df9262c28f995b Mon Sep 17 00:00:00 2001 From: "builds.sr.ht" Date: Fri, 30 Aug 2024 22:21:19 +0000 Subject: [PATCH] Squashed 'subprojects/d2tk/' changes from eba0346..5f7b3e2 5f7b3e2 release-0.6.2 6cb3376 Revert back to default color theme 7c03b01 release-0.6.0 git-subtree-dir: subprojects/d2tk git-subtree-split: 5f7b3e2b0d1ad7536a92ac59ac5b43d08141fcbd --- meson_options.txt | 2 +- src/base.c | 60 +++++++++++++++++++++++++---------------------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index b745e0d..00af07c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -55,4 +55,4 @@ option('use-fontconfig', value : 'disabled', yield : true) -option('version', type : 'string', value : '0.5.27') +option('version', type : 'string', value : '0.7.5') diff --git a/src/base.c b/src/base.c index b64dd13..30ccc33 100644 --- a/src/base.c +++ b/src/base.c @@ -677,9 +677,13 @@ d2tk_base_is_active_hot(d2tk_base_t *base, d2tk_id_t id, } #define nocol 0x0 -#define col1 0x020202ff -#define col2 0x026cfdff -#define col3 0xfdfdfdff +#define light_grey 0x7f7f7fff +#define dark_grey 0x3f3f3fff +#define darker_grey 0x222222ff +#define black 0x000000ff +#define white 0xffffffff +#define light_orange 0xffcf00ff +#define dark_orange 0xcf9f00ff #define FONT_SANS_BOLD "FiraSans:bold" @@ -691,36 +695,36 @@ d2tk_base_get_default_style(void) .border_width = 1, .padding = 1, .rounding = 4, - .bg_color = col1, + .bg_color = darker_grey, .fill_color = { - [D2TK_TRIPLE_NONE] = col3, - [D2TK_TRIPLE_HOT] = col3, - [D2TK_TRIPLE_ACTIVE] = col2, - [D2TK_TRIPLE_ACTIVE_HOT] = col2, - [D2TK_TRIPLE_FOCUS] = col3, - [D2TK_TRIPLE_HOT_FOCUS] = col3, - [D2TK_TRIPLE_ACTIVE_FOCUS] = col2, - [D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = col2, + [D2TK_TRIPLE_NONE] = dark_grey, + [D2TK_TRIPLE_HOT] = light_grey, + [D2TK_TRIPLE_ACTIVE] = dark_orange, + [D2TK_TRIPLE_ACTIVE_HOT] = light_orange, + [D2TK_TRIPLE_FOCUS] = dark_grey, + [D2TK_TRIPLE_HOT_FOCUS] = light_grey, + [D2TK_TRIPLE_ACTIVE_FOCUS] = dark_orange, + [D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = light_orange, }, .stroke_color = { - [D2TK_TRIPLE_NONE] = col1, - [D2TK_TRIPLE_HOT] = col2, - [D2TK_TRIPLE_ACTIVE] = col1, - [D2TK_TRIPLE_ACTIVE_HOT] = col3, - [D2TK_TRIPLE_FOCUS] = col1, - [D2TK_TRIPLE_HOT_FOCUS] = col2, - [D2TK_TRIPLE_ACTIVE_FOCUS] = col1, - [D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = col3, + [D2TK_TRIPLE_NONE] = black, + [D2TK_TRIPLE_HOT] = black, + [D2TK_TRIPLE_ACTIVE] = black, + [D2TK_TRIPLE_ACTIVE_HOT] = black, + [D2TK_TRIPLE_FOCUS] = white, + [D2TK_TRIPLE_HOT_FOCUS] = white, + [D2TK_TRIPLE_ACTIVE_FOCUS] = white, + [D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = white, }, .text_stroke_color = { - [D2TK_TRIPLE_NONE] = col1, - [D2TK_TRIPLE_HOT] = col2, - [D2TK_TRIPLE_ACTIVE] = col1, - [D2TK_TRIPLE_ACTIVE_HOT] = col3, - [D2TK_TRIPLE_FOCUS] = col1, - [D2TK_TRIPLE_HOT_FOCUS] = col2, - [D2TK_TRIPLE_ACTIVE_FOCUS] = col1, - [D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = col3 + [D2TK_TRIPLE_NONE] = white, + [D2TK_TRIPLE_HOT] = light_orange, + [D2TK_TRIPLE_ACTIVE] = white, + [D2TK_TRIPLE_ACTIVE_HOT] = dark_grey, + [D2TK_TRIPLE_FOCUS] = white, + [D2TK_TRIPLE_HOT_FOCUS] = light_orange, + [D2TK_TRIPLE_ACTIVE_FOCUS] = white, + [D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = dark_grey }, .text_fill_color = { [D2TK_TRIPLE_NONE] = nocol, -- 2.45.2