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

code clean up (part 1)

Browse source
This commit is contained in:
David Barr 2024-10-16 18:48:39 +01:00 • committed by GitHub
parent f42b51f509
commit 4e4d8ae44f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 32 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/menu/menu.c
View file

@ -86,31 +86,29 @@ menu_create(struct server *server, const char *id, const char *label)
/* menu->size.height will be kept up to date by adding items */ /* menu->size.height will be kept up to date by adding items */
menu->scene_tree = wlr_scene_tree_create(server->menu_tree); menu->scene_tree = wlr_scene_tree_create(server->menu_tree);
wlr_scene_node_set_enabled(&menu->scene_tree->node, false); wlr_scene_node_set_enabled(&menu->scene_tree->node, false);
/* Create border rectangle */ /* Create border rectangle */
menu->border = wlr_scene_rect_create(menu->scene_tree, menu->border = wlr_scene_rect_create(menu->scene_tree,
menu->size.width + 2 * server->theme->menu_border_width, menu->size.width + 2 * server->theme->menu_border_width,
2 * server->theme->menu_border_width, 2 * server->theme->menu_border_width,
server->theme->menu_border_color); server->theme->menu_border_color);
/* Create background rectangle */ /* Create background rectangle */
menu->background = wlr_scene_rect_create(menu->scene_tree, menu->background = wlr_scene_rect_create(menu->scene_tree,
menu->size.width, menu->size.width,
menu->size.height, menu->size.height,
server->theme->menu_items_bg_color); server->theme->menu_items_bg_color);
/* Position background inside border */ /* Position background inside border */
wlr_scene_node_set_position(&menu->background->node, wlr_scene_node_set_position(&menu->background->node,
server->theme->menu_border_width,
server->theme->menu_border_width);
/* Create a new scene tree for menu items */
menu->items_tree = wlr_scene_tree_create(menu->scene_tree);
wlr_scene_node_set_position(&menu->items_tree->node,
server->theme->menu_border_width, server->theme->menu_border_width,
server->theme->menu_border_width); server->theme->menu_border_width);
/* Create a new scene tree for menu items */
menu->items_tree = wlr_scene_tree_create(menu->scene_tree);
wlr_scene_node_set_position(&menu->items_tree->node,
server->theme->menu_border_width,
server->theme->menu_border_width);
return menu; return menu;
} }
@ -145,23 +143,21 @@ menu_update_width(struct menu *menu)
} }
menu->size.width = max_width + 2 * theme->menu_item_padding_x; menu->size.width = max_width + 2 * theme->menu_item_padding_x;
// Update border size /* Update border size */
wlr_scene_rect_set_size(menu->border, wlr_scene_rect_set_size(menu->border,
menu->size.width + 2 * theme->menu_border_width, menu->size.width + 2 * theme->menu_border_width,
menu->size.height + 2 * theme->menu_border_width); menu->size.height + 2 * theme->menu_border_width);
/* Update background size and position */
// Update background size and position wlr_scene_rect_set_size(menu->background,
wlr_scene_rect_set_size(menu->background, menu->size.width,
menu->size.width, menu->size.height);
menu->size.height); wlr_scene_node_set_position(&menu->background->node,
wlr_scene_node_set_position(&menu->background->node, theme->menu_border_width,
theme->menu_border_width, theme->menu_border_width)};
theme->menu_border_width); /* Update items_tree position */
wlr_scene_node_set_position(&menu->items_tree->node,
// Update items_tree position theme->menu_border_width,
wlr_scene_node_set_position(&menu->items_tree->node, theme->menu_border_width);
theme->menu_border_width,
theme->menu_border_width);
/* /*
* TODO: This function is getting a bit unwieldy. Consider calculating * TODO: This function is getting a bit unwieldy. Consider calculating