code clean up (part 1)

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

View file

@ -86,7 +86,6 @@ 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,
@ -110,7 +109,6 @@ menu_create(struct server *server, const char *id, const char *label)
server->theme->menu_border_width, server->theme->menu_border_width,
server->theme->menu_border_width); server->theme->menu_border_width);
return menu; return menu;
} }
@ -145,20 +143,18 @@ 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 */
// Update items_tree position
wlr_scene_node_set_position(&menu->items_tree->node, wlr_scene_node_set_position(&menu->items_tree->node,
theme->menu_border_width, theme->menu_border_width,
theme->menu_border_width); theme->menu_border_width);