From 71a5867a32770aa442c138938fcd73b27f9714b7 Mon Sep 17 00:00:00 2001 From: David Barr Date: Thu, 17 Oct 2024 13:16:20 +0100 Subject: [PATCH] more space/tab cleanups --- src/menu/menu.c | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/menu/menu.c b/src/menu/menu.c index a067842f..cc74f15a 100644 --- a/src/menu/menu.c +++ b/src/menu/menu.c @@ -87,8 +87,8 @@ menu_create(struct server *server, const char *id, const char *label) menu->scene_tree = wlr_scene_tree_create(server->menu_tree); wlr_scene_node_set_enabled(&menu->scene_tree->node, false); /* Create border rectangle */ - menu->border = wlr_scene_rect_create(menu->scene_tree, - menu->size.width + 2 * server->theme->menu_border_width, + menu->border = wlr_scene_rect_create(menu->scene_tree, + menu->size.width + 2 * server->theme->menu_border_width, 2 * server->theme->menu_border_width, server->theme->menu_border_color); @@ -98,12 +98,12 @@ menu_create(struct server *server, const char *id, const char *label) menu->size.height, server->theme->menu_items_bg_color); - /* Position background inside border */ - wlr_scene_node_set_position(&menu->background->node, - server->theme->menu_border_width, - server->theme->menu_border_width); + /* Position background inside border */ + 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 */ + /* 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, @@ -143,12 +143,12 @@ menu_update_width(struct menu *menu) } menu->size.width = max_width + 2 * theme->menu_item_padding_x; /* Update border size */ - wlr_scene_rect_set_size(menu->border, - menu->size.width + 2 * theme->menu_border_width, + wlr_scene_rect_set_size(menu->border, + menu->size.width + 2 * theme->menu_border_width, menu->size.height + 2 * theme->menu_border_width); /* Update background size and position */ - wlr_scene_rect_set_size(menu->background, + wlr_scene_rect_set_size(menu->background, menu->size.width, menu->size.height); wlr_scene_node_set_position(&menu->background->node, @@ -156,8 +156,8 @@ menu_update_width(struct menu *menu) theme->menu_border_width); /* Update items_tree position */ - wlr_scene_node_set_position(&menu->items_tree->node, - theme->menu_border_width, + wlr_scene_node_set_position(&menu->items_tree->node, + theme->menu_border_width, theme->menu_border_width); /* @@ -273,11 +273,11 @@ item_create(struct menu *menu, const char *text, bool show_arrow) menuitem->native_width += font_width(&rc.font_menuitem, arrow); } - /* Menu item root node */ - menuitem->tree = wlr_scene_tree_create(menu->items_tree); - node_descriptor_create(&menuitem->tree->node, - LAB_NODE_DESC_MENUITEM, menuitem); - + /* Menu item root node */ + menuitem->tree = wlr_scene_tree_create(menu->items_tree); + node_descriptor_create(&menuitem->tree->node, + LAB_NODE_DESC_MENUITEM, menuitem); + /* Tree for each state to hold background and text buffer */ menuitem->normal.tree = wlr_scene_tree_create(menuitem->tree); menuitem->selected.tree = wlr_scene_tree_create(menuitem->tree); @@ -347,7 +347,7 @@ separator_create(struct menu *menu, const char *label) : LAB_MENU_TITLE; struct server *server = menu->server; struct theme *theme = server->theme; - + if (menuitem->type == LAB_MENU_TITLE) { menuitem->height = theme->menu_item_height; menuitem->native_width = font_width(&rc.font_menuheader, label); @@ -1187,13 +1187,13 @@ menu_free(struct menu *menu) } /* - * Destroying the root node will destroy everything, - * including node descriptors and scaled_font_buffers. - */ - wlr_scene_node_destroy(&menu->border->node); - wlr_scene_node_destroy(&menu->background->node); - wlr_scene_node_destroy(&menu->items_tree->node); - wlr_scene_node_destroy(&menu->scene_tree->node); + * Destroying the root node will destroy everything, + * including node descriptors and scaled_font_buffers. + */ + wlr_scene_node_destroy(&menu->border->node); + wlr_scene_node_destroy(&menu->background->node); + wlr_scene_node_destroy(&menu->items_tree->node); + wlr_scene_node_destroy(&menu->scene_tree->node); wl_list_remove(&menu->link); zfree(menu->id); zfree(menu->label);