Un-global theme variable

This commit is contained in:
Johan Malm 2021-02-21 21:54:40 +00:00
parent 9af7bd744f
commit 1b263e1f67
10 changed files with 64 additions and 57 deletions

View file

@ -78,21 +78,21 @@ out:
}
void
xbm_load(struct wlr_renderer *r)
xbm_load(struct theme *theme, struct wlr_renderer *r)
{
parse_set_color(theme.window_active_button_unpressed_image_color);
load_button(r, "close.xbm", &theme.xbm_close_active_unpressed,
parse_set_color(theme->window_active_button_unpressed_image_color);
load_button(r, "close.xbm", &theme->xbm_close_active_unpressed,
close_button_normal);
load_button(r, "max.xbm", &theme.xbm_maximize_active_unpressed,
load_button(r, "max.xbm", &theme->xbm_maximize_active_unpressed,
max_button_normal);
load_button(r, "iconify.xbm", &theme.xbm_iconify_active_unpressed,
load_button(r, "iconify.xbm", &theme->xbm_iconify_active_unpressed,
iconify_button_normal);
parse_set_color(theme.window_inactive_button_unpressed_image_color);
load_button(r, "close.xbm", &theme.xbm_close_inactive_unpressed,
parse_set_color(theme->window_inactive_button_unpressed_image_color);
load_button(r, "close.xbm", &theme->xbm_close_inactive_unpressed,
close_button_normal);
load_button(r, "max.xbm", &theme.xbm_maximize_inactive_unpressed,
load_button(r, "max.xbm", &theme->xbm_maximize_inactive_unpressed,
max_button_normal);
load_button(r, "iconify.xbm", &theme.xbm_iconify_inactive_unpressed,
load_button(r, "iconify.xbm", &theme->xbm_iconify_inactive_unpressed,
iconify_button_normal);
}