diff options
author | oliver-giersch <oliver.giersch@gmail.com> | 2020-09-02 15:03:48 +0200 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-09-04 18:17:42 +0200 |
commit | a543fa35ffc93b832770988121209d4e939a2237 (patch) | |
tree | 24e1123ea087439d4dfdba3770bdcfc8bf16800e /swaynag/types.c | |
parent | swaymsg.1: expand tip for multi-word strings. (diff) | |
download | sway-a543fa35ffc93b832770988121209d4e939a2237.tar.gz sway-a543fa35ffc93b832770988121209d4e939a2237.tar.zst sway-a543fa35ffc93b832770988121209d4e939a2237.zip |
swaynag: adds option to separately specify the text color for buttons
Diffstat (limited to 'swaynag/types.c')
-rw-r--r-- | swaynag/types.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/swaynag/types.c b/swaynag/types.c index 4caaf6f7..576dcbff 100644 --- a/swaynag/types.c +++ b/swaynag/types.c | |||
@@ -38,6 +38,7 @@ void swaynag_types_add_default(list_t *types) { | |||
38 | type_defaults->button_background = 0x333333FF; | 38 | type_defaults->button_background = 0x333333FF; |
39 | type_defaults->background = 0x323232FF; | 39 | type_defaults->background = 0x323232FF; |
40 | type_defaults->text = 0xFFFFFFFF; | 40 | type_defaults->text = 0xFFFFFFFF; |
41 | type_defaults->button_text = 0xFFFFFFFF; | ||
41 | type_defaults->border = 0x222222FF; | 42 | type_defaults->border = 0x222222FF; |
42 | type_defaults->border_bottom = 0x444444FF; | 43 | type_defaults->border_bottom = 0x444444FF; |
43 | type_defaults->bar_border_thickness = 2; | 44 | type_defaults->bar_border_thickness = 2; |
@@ -54,6 +55,7 @@ void swaynag_types_add_default(list_t *types) { | |||
54 | type_error->button_background = 0x680A0AFF; | 55 | type_error->button_background = 0x680A0AFF; |
55 | type_error->background = 0x900000FF; | 56 | type_error->background = 0x900000FF; |
56 | type_error->text = 0xFFFFFFFF; | 57 | type_error->text = 0xFFFFFFFF; |
58 | type_error->button_text = 0xFFFFFFFF; | ||
57 | type_error->border = 0xD92424FF; | 59 | type_error->border = 0xD92424FF; |
58 | type_error->border_bottom = 0x470909FF; | 60 | type_error->border_bottom = 0x470909FF; |
59 | list_add(types, type_error); | 61 | list_add(types, type_error); |
@@ -62,6 +64,7 @@ void swaynag_types_add_default(list_t *types) { | |||
62 | type_warning->button_background = 0xFFC100FF; | 64 | type_warning->button_background = 0xFFC100FF; |
63 | type_warning->background = 0xFFA800FF; | 65 | type_warning->background = 0xFFA800FF; |
64 | type_warning->text = 0x000000FF; | 66 | type_warning->text = 0x000000FF; |
67 | type_warning->button_text = 0x000000FF; | ||
65 | type_warning->border = 0xAB7100FF; | 68 | type_warning->border = 0xAB7100FF; |
66 | type_warning->border_bottom = 0xAB7100FF; | 69 | type_warning->border_bottom = 0xAB7100FF; |
67 | list_add(types, type_warning); | 70 | list_add(types, type_warning); |
@@ -107,6 +110,11 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) { | |||
107 | dest->text = src->text; | 110 | dest->text = src->text; |
108 | } | 111 | } |
109 | 112 | ||
113 | if (src->button_text > 0) { | ||
114 | dest->button_text = src->button_text; | ||
115 | } | ||
116 | |||
117 | |||
110 | if (src->border > 0) { | 118 | if (src->border > 0) { |
111 | dest->border = src->border; | 119 | dest->border = src->border; |
112 | } | 120 | } |