mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-05 13:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

theme: inherit osd colors if not set

Browse source
This commit is contained in:
Johan Malm 2021-10-15 21:44:27 +01:00
parent 597650b457
commit 54d22a7129
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/theme.c
View file

@ -71,7 +71,7 @@ parse_hexstr(const char *hex, float *rgba)
* this was a bit hard-line. People might want to try labwc without having * this was a bit hard-line. People might want to try labwc without having
* Openbox (and associated themes) installed. * Openbox (and associated themes) installed.
* *
* theme_builtin() applies a theme very similar to Clearlooks-3.4 * theme_builtin() applies a theme that is similar to vanilla GTK
*/ */
static void static void
theme_builtin(struct theme *theme) theme_builtin(struct theme *theme)
@ -106,8 +106,9 @@ theme_builtin(struct theme *theme)
parse_hexstr("#dddad6", theme->menu_items_active_bg_color); parse_hexstr("#dddad6", theme->menu_items_active_bg_color);
parse_hexstr("#000000", theme->menu_items_active_text_color); parse_hexstr("#000000", theme->menu_items_active_text_color);
parse_hexstr("#dddad6", theme->osd_bg_color); /* inherit colors in post_processing() if not set elsewhere */
parse_hexstr("#000000", theme->osd_label_text_color); theme->osd_bg_color[0] = FLT_MIN;
theme->osd_label_text_color[0] = FLT_MIN;
} }
static bool static bool
@ -432,6 +433,17 @@ post_processing(struct theme *theme)
theme->title_height = rc.corner_radius + 1; theme->title_height = rc.corner_radius + 1;
} }
/* Inherit colors if not set */
if (theme->osd_bg_color[0] == FLT_MIN) {
memcpy(theme->osd_bg_color,
theme->window_active_title_bg_color,
sizeof(theme->osd_bg_color));
}
if (theme->osd_label_text_color[0] == FLT_MIN) {
memcpy(theme->osd_label_text_color,
theme->window_active_label_text_color,
sizeof(theme->osd_label_text_color));
}
} }
void void