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

menu: guard against negative sizes

Browse source 
For example, the size of a scene_rect for a menu item background could be
negative with:

  menu.width.max: 0
  menu.width.min: 0
This commit is contained in:
tokyo4j 2025-05-03 19:57:49 +09:00 • committed by Hiroaki Yamamoto
parent 568bc71ca2
commit f1c4720218
1 changed files with 32 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/menu/menu.c
View file

@ -174,14 +174,19 @@ item_create_scene_for_state(struct menuitem *item, float *text_color,
icon_width = theme->menu_items_padding_x + icon_size; icon_width = theme->menu_items_padding_x + icon_size;
} }
/* Create background */ int bg_width = menu->size.width - 2 * theme->menu_border_width;
int bg_width = menu->size.width
- 2 * theme->menu_border_width;
wlr_scene_rect_create(tree, bg_width, theme->menu_item_height, bg_color);
int arrow_width = item->arrow ? int arrow_width = item->arrow ?
font_width(&rc.font_menuitem, item->arrow) : 0; font_width(&rc.font_menuitem, item->arrow) : 0;
int label_max_width = bg_width - 2 * theme->menu_items_padding_x - arrow_width - icon_width; int label_max_width = bg_width - 2 * theme->menu_items_padding_x
- arrow_width - icon_width;
if (label_max_width <= 0) {
wlr_log(WLR_ERROR, "not enough space for menu contents");
return tree;
}
/* Create background */
wlr_scene_rect_create(tree, bg_width, theme->menu_item_height, bg_color);
/* Create icon */ /* Create icon */
bool show_app_icon = !strcmp(item->parent->id, "client-list-combined-menu") bool show_app_icon = !strcmp(item->parent->id, "client-list-combined-menu")
@ -283,9 +288,6 @@ separator_create_scene(struct menuitem *menuitem, int *item_y)
assert(menuitem->type == LAB_MENU_SEPARATOR_LINE); assert(menuitem->type == LAB_MENU_SEPARATOR_LINE);
struct menu *menu = menuitem->parent; struct menu *menu = menuitem->parent;
struct theme *theme = menu->server->theme; struct theme *theme = menu->server->theme;
int bg_width = menu->size.width - 2 * theme->menu_border_width;
int bg_height = theme->menu_separator_line_thickness
+ 2 * theme->menu_separator_padding_height;
/* Menu item root node */ /* Menu item root node */
menuitem->tree = wlr_scene_tree_create(menu->scene_tree); menuitem->tree = wlr_scene_tree_create(menu->scene_tree);
@ -295,12 +297,21 @@ separator_create_scene(struct menuitem *menuitem, int *item_y)
/* Tree to hold background and line buffer */ /* Tree to hold background and line buffer */
menuitem->normal_tree = wlr_scene_tree_create(menuitem->tree); menuitem->normal_tree = wlr_scene_tree_create(menuitem->tree);
int bg_height = theme->menu_separator_line_thickness
+ 2 * theme->menu_separator_padding_height;
int bg_width = menu->size.width - 2 * theme->menu_border_width;
int line_width = bg_width - 2 * theme->menu_separator_padding_width;
if (line_width <= 0) {
wlr_log(WLR_ERROR, "not enough space for menu separator");
goto error;
}
/* Item background nodes */ /* Item background nodes */
wlr_scene_rect_create(menuitem->normal_tree, bg_width, bg_height, wlr_scene_rect_create(menuitem->normal_tree, bg_width, bg_height,
theme->menu_items_bg_color); theme->menu_items_bg_color);
/* Draw separator line */ /* Draw separator line */
int line_width = bg_width - 2 * theme->menu_separator_padding_width;
struct wlr_scene_rect *line_rect = wlr_scene_rect_create( struct wlr_scene_rect *line_rect = wlr_scene_rect_create(
menuitem->normal_tree, line_width, menuitem->normal_tree, line_width,
theme->menu_separator_line_thickness, theme->menu_separator_line_thickness,
@ -310,6 +321,7 @@ separator_create_scene(struct menuitem *menuitem, int *item_y)
wlr_scene_node_set_position(&line_rect->node, wlr_scene_node_set_position(&line_rect->node,
theme->menu_separator_padding_width, theme->menu_separator_padding_width,
theme->menu_separator_padding_height); theme->menu_separator_padding_height);
error:
wlr_scene_node_set_position(&menuitem->tree->node, wlr_scene_node_set_position(&menuitem->tree->node,
theme->menu_border_width, *item_y); theme->menu_border_width, *item_y);
*item_y += bg_height; *item_y += bg_height;
@ -324,7 +336,6 @@ title_create_scene(struct menuitem *menuitem, int *item_y)
struct theme *theme = menu->server->theme; struct theme *theme = menu->server->theme;
float *bg_color = theme->menu_title_bg_color; float *bg_color = theme->menu_title_bg_color;
float *text_color = theme->menu_title_text_color; float *text_color = theme->menu_title_text_color;
int bg_width = menu->size.width - 2 * theme->menu_border_width;
/* Menu item root node */ /* Menu item root node */
menuitem->tree = wlr_scene_tree_create(menu->scene_tree); menuitem->tree = wlr_scene_tree_create(menu->scene_tree);
@ -334,6 +345,14 @@ title_create_scene(struct menuitem *menuitem, int *item_y)
/* Tree to hold background and text buffer */ /* Tree to hold background and text buffer */
menuitem->normal_tree = wlr_scene_tree_create(menuitem->tree); menuitem->normal_tree = wlr_scene_tree_create(menuitem->tree);
int bg_width = menu->size.width - 2 * theme->menu_border_width;
int text_width = bg_width - 2 * theme->menu_items_padding_x;
if (text_width <= 0) {
wlr_log(WLR_ERROR, "not enough space for menu title");
goto error;
}
/* Background */ /* Background */
wlr_scene_rect_create(menuitem->normal_tree, wlr_scene_rect_create(menuitem->normal_tree,
bg_width, theme->menu_header_height, bg_color); bg_width, theme->menu_header_height, bg_color);
@ -343,8 +362,7 @@ title_create_scene(struct menuitem *menuitem, int *item_y)
scaled_font_buffer_create(menuitem->normal_tree); scaled_font_buffer_create(menuitem->normal_tree);
assert(title_font_buffer); assert(title_font_buffer);
scaled_font_buffer_update(title_font_buffer, menuitem->text, scaled_font_buffer_update(title_font_buffer, menuitem->text,
bg_width - 2 * theme->menu_items_padding_x, text_width, &rc.font_menuheader, text_color, bg_color);
&rc.font_menuheader, text_color, bg_color);
int title_x = 0; int title_x = 0;
switch (theme->menu_title_text_justify) { switch (theme->menu_title_text_justify) {
@ -363,7 +381,7 @@ title_create_scene(struct menuitem *menuitem, int *item_y)
int title_y = (theme->menu_header_height - title_font_buffer->height) / 2; int title_y = (theme->menu_header_height - title_font_buffer->height) / 2;
wlr_scene_node_set_position(&title_font_buffer->scene_buffer->node, wlr_scene_node_set_position(&title_font_buffer->scene_buffer->node,
title_x, title_y); title_x, title_y);
error:
wlr_scene_node_set_position(&menuitem->tree->node, wlr_scene_node_set_position(&menuitem->tree->node,
theme->menu_border_width, *item_y); theme->menu_border_width, *item_y);
*item_y += theme->menu_header_height; *item_y += theme->menu_header_height;