mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-28 07:58:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

theme: add window.active.border.color

Browse source 
This replaces window.active.handle.bg.color which will no longer be
supported.
This commit is contained in:
Johan Malm 2021-04-10 18:40:43 +01:00
parent f3a0db29f5
commit 31d3a53e46
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/labwc-theme.5.scd
View file

@ -33,12 +33,12 @@ A theme consists of a themerc file and optionally some xbm icons.
Line width (integer) of border border drawn around window frames. Line width (integer) of border border drawn around window frames.
Default is 1. Default is 1.
*window.active.border.color*
Border color of active window
*window.active.title.bg.color* *window.active.title.bg.color*
Background for the focussed window's titlebar Background for the focussed window's titlebar
*window.active.handle.bg.color*
Background for the focussed window's handle.
*window.inactive.title.bg.color* *window.inactive.title.bg.color*
Background for non-focussed windows' titlebars Background for non-focussed windows' titlebars

4
include/theme.h
View file

@ -14,10 +14,10 @@ struct theme {
int border_width; int border_width;
float window_active_title_bg_color[4]; float window_active_title_bg_color[4];
float window_active_handle_bg_color[4];
float window_inactive_title_bg_color[4]; float window_inactive_title_bg_color[4];
float window_active_border_color[4];
float window_active_button_unpressed_image_color[4]; float window_active_button_unpressed_image_color[4];
float window_inactive_button_unpressed_image_color[4]; float window_inactive_button_unpressed_image_color[4];

6
src/ssd.c
View file

@ -256,8 +256,8 @@ ssd_create(struct view *view)
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
part = add_part(view, border[i]); part = add_part(view, border[i]);
part->box = ssd_box(view, border[i]); part->box = ssd_box(view, border[i]);
part->color.active = theme->window_active_handle_bg_color; part->color.active = theme->window_active_border_color;
part->color.inactive = theme->window_active_handle_bg_color; part->color.inactive = theme->window_active_border_color;
} }
/* titlebar */ /* titlebar */
@ -275,7 +275,7 @@ ssd_create(struct view *view)
.radius = rc.corner_radius, .radius = rc.corner_radius,
.line_width = theme->border_width, .line_width = theme->border_width,
.fill_color = theme->window_active_title_bg_color, .fill_color = theme->window_active_title_bg_color,
.border_color = theme->window_active_handle_bg_color, .border_color = theme->window_active_border_color,
.corner = LAB_CORNER_TOP_LEFT, .corner = LAB_CORNER_TOP_LEFT,
}; };
part->texture.active = rounded_rect(renderer, &ctx); part->texture.active = rounded_rect(renderer, &ctx);

4
src/theme.c
View file

@ -65,7 +65,7 @@ void theme_builtin(struct theme *theme)
{ {
theme->border_width = 1; theme->border_width = 1;
parse_hexstr("#589bda", theme->window_active_title_bg_color); parse_hexstr("#589bda", theme->window_active_title_bg_color);
parse_hexstr("#3c7cb7", theme->window_active_handle_bg_color); parse_hexstr("#3c7cb7", theme->window_active_border_color);
parse_hexstr("#efece6", theme->window_inactive_title_bg_color); parse_hexstr("#efece6", theme->window_inactive_title_bg_color);
parse_hexstr("#ffffff", theme->window_active_button_unpressed_image_color); parse_hexstr("#ffffff", theme->window_active_button_unpressed_image_color);
parse_hexstr("#000000", theme->window_inactive_button_unpressed_image_color); parse_hexstr("#000000", theme->window_inactive_button_unpressed_image_color);
@ -91,7 +91,7 @@ static void entry(struct theme *theme, const char *key, const char *value)
} else if (match(key, "window.active.title.bg.color")) { } else if (match(key, "window.active.title.bg.color")) {
parse_hexstr(value, theme->window_active_title_bg_color); parse_hexstr(value, theme->window_active_title_bg_color);
} else if (match(key, "window.active.handle.bg.color")) { } else if (match(key, "window.active.handle.bg.color")) {
parse_hexstr(value, theme->window_active_handle_bg_color); parse_hexstr(value, theme->window_active_border_color);
} else if (match(key, "window.inactive.title.bg.color")) { } else if (match(key, "window.inactive.title.bg.color")) {
parse_hexstr(value, theme->window_inactive_title_bg_color); parse_hexstr(value, theme->window_inactive_title_bg_color);
} else if (match(key, "window.active.button.unpressed.image.color")) { } else if (match(key, "window.active.button.unpressed.image.color")) {