mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-13 04:27:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

menu: support borders

Browse source 
This commit adds following theme configurations:

  menu.border.width: 1
  menu.border.color: #aaaaaa
This commit is contained in:
tokyo4j 2024-11-24 14:40:40 +09:00 • committed by Johan Malm
parent fb6bf3fdde
commit da418f9720
5 changed files with 67 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/theme.c
View file

@ -597,6 +597,8 @@ theme_builtin(struct theme *theme, struct server *server)
theme->menu_overlap_y = 0;
theme->menu_min_width = 20;
theme->menu_max_width = 200;
theme->menu_border_width = INT_MIN;
theme->menu_border_color[0] = FLT_MIN;
theme->menu_items_padding_x = 7;
theme->menu_items_padding_y = 4;
@ -864,6 +866,13 @@ entry(struct theme *theme, const char *key, const char *value)
theme->menu_max_width = get_int_if_positive(
value, "menu.width.max");
}
if (match_glob(key, "menu.border.width")) {
theme->menu_border_width = get_int_if_positive(
value, "menu.border.width");
}
if (match_glob(key, "menu.border.color")) {
parse_hexstr(value, theme->menu_border_color);
}
if (match_glob(key, "menu.items.padding.x")) {
theme->menu_items_padding_x = get_int_if_positive(
@ -1448,7 +1457,8 @@ post_processing(struct theme *theme)
+ 2 * theme->menu_items_padding_y;
theme->menu_header_height = font_height(&rc.font_menuheader)
+ 2 * theme->menu_items_padding_y;
+ 2 * theme->menu_items_padding_y
+ 2 * theme->menu_border_width;
theme->osd_window_switcher_item_height = font_height(&rc.font_osd)
+ 2 * theme->osd_window_switcher_item_padding_y
@ -1471,6 +1481,15 @@ post_processing(struct theme *theme)
theme->menu_max_width = theme->menu_min_width;
}
if (theme->menu_border_width == INT_MIN) {
theme->menu_border_width = theme->border_width;
}
if (theme->menu_border_color[0] == FLT_MIN) {
memcpy(theme->menu_border_color,
theme->window[THEME_ACTIVE].border_color,
sizeof(theme->menu_border_color));
}
/* Inherit OSD settings if not set */
if (theme->osd_bg_color[0] == FLT_MIN) {
memcpy(theme->osd_bg_color,