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

theme: rename menu_item_padding to menu_items_padding

Browse source
This commit is contained in:
tokyo4j 2024-11-12 12:36:21 +09:00 • committed by Johan Malm
parent d916a78aca
commit 1639919889
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/theme.h
View file

@ -102,8 +102,8 @@ struct theme {
int menu_min_width; int menu_min_width;
int menu_max_width; int menu_max_width;
int menu_item_padding_x; int menu_items_padding_x;
int menu_item_padding_y; int menu_items_padding_y;
float menu_items_bg_color[4]; float menu_items_bg_color[4];
float menu_items_text_color[4]; float menu_items_text_color[4];
float menu_items_active_bg_color[4]; float menu_items_active_bg_color[4];

6
src/menu/menu.c
View file

@ -118,7 +118,7 @@ menu_update_width(struct menu *menu)
? item->native_width : theme->menu_max_width; ? item->native_width : theme->menu_max_width;
} }
} }
menu->size.width = max_width + 2 * theme->menu_item_padding_x; menu->size.width = max_width + 2 * theme->menu_items_padding_x;
/* /*
* TODO: This function is getting a bit unwieldy. Consider calculating * TODO: This function is getting a bit unwieldy. Consider calculating
@ -275,7 +275,7 @@ item_create(struct menu *menu, const char *text, bool show_arrow)
theme->menu_items_active_bg_color, arrow); theme->menu_items_active_bg_color, arrow);
/* Center font nodes */ /* Center font nodes */
x = theme->menu_item_padding_x; x = theme->menu_items_padding_x;
y = (theme->menu_item_height - menuitem->normal.buffer->height) / 2; y = (theme->menu_item_height - menuitem->normal.buffer->height) / 2;
wlr_scene_node_set_position(menuitem->normal.text, x, y); wlr_scene_node_set_position(menuitem->normal.text, x, y);
y = (theme->menu_item_height - menuitem->selected.buffer->height) / 2; y = (theme->menu_item_height - menuitem->selected.buffer->height) / 2;
@ -347,7 +347,7 @@ separator_create(struct menu *menu, const char *label)
text_color, bg_color, /* arrow */ NULL); text_color, bg_color, /* arrow */ NULL);
/* Center font nodes */ /* Center font nodes */
int x, y; int x, y;
x = theme->menu_item_padding_x; x = theme->menu_items_padding_x;
y = (theme->menu_header_height - menuitem->normal.buffer->height) / 2; y = (theme->menu_header_height - menuitem->normal.buffer->height) / 2;
wlr_scene_node_set_position(menuitem->normal.text, x, y); wlr_scene_node_set_position(menuitem->normal.text, x, y);
} else { } else {

12
src/theme.c
View file

@ -599,8 +599,8 @@ theme_builtin(struct theme *theme, struct server *server)
theme->menu_min_width = 20; theme->menu_min_width = 20;
theme->menu_max_width = 200; theme->menu_max_width = 200;
theme->menu_item_padding_x = 7; theme->menu_items_padding_x = 7;
theme->menu_item_padding_y = 4; theme->menu_items_padding_y = 4;
parse_hexstr("#fcfbfa", theme->menu_items_bg_color); parse_hexstr("#fcfbfa", theme->menu_items_bg_color);
parse_hexstr("#000000", theme->menu_items_text_color); parse_hexstr("#000000", theme->menu_items_text_color);
parse_hexstr("#e1dedb", theme->menu_items_active_bg_color); parse_hexstr("#e1dedb", theme->menu_items_active_bg_color);
@ -869,11 +869,11 @@ entry(struct theme *theme, const char *key, const char *value)
} }
if (match_glob(key, "menu.items.padding.x")) { if (match_glob(key, "menu.items.padding.x")) {
theme->menu_item_padding_x = get_int_if_positive( theme->menu_items_padding_x = get_int_if_positive(
value, "menu.items.padding.x"); value, "menu.items.padding.x");
} }
if (match_glob(key, "menu.items.padding.y")) { if (match_glob(key, "menu.items.padding.y")) {
theme->menu_item_padding_y = get_int_if_positive( theme->menu_items_padding_y = get_int_if_positive(
value, "menu.items.padding.y"); value, "menu.items.padding.y");
} }
if (match_glob(key, "menu.items.bg.color")) { if (match_glob(key, "menu.items.bg.color")) {
@ -1448,10 +1448,10 @@ post_processing(struct theme *theme)
theme->title_height = get_titlebar_height(theme); theme->title_height = get_titlebar_height(theme);
theme->menu_item_height = font_height(&rc.font_menuitem) theme->menu_item_height = font_height(&rc.font_menuitem)
+ 2 * theme->menu_item_padding_y; + 2 * theme->menu_items_padding_y;
theme->menu_header_height = font_height(&rc.font_menuheader) theme->menu_header_height = font_height(&rc.font_menuheader)
+ 2 * theme->menu_item_padding_y; + 2 * theme->menu_items_padding_y;
theme->osd_window_switcher_item_height = font_height(&rc.font_osd) theme->osd_window_switcher_item_height = font_height(&rc.font_osd)
+ 2 * theme->osd_window_switcher_item_padding_y + 2 * theme->osd_window_switcher_item_padding_y