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

more space/tab cleanups

Browse source
This commit is contained in:
David Barr 2024-10-17 13:16:20 +01:00 • committed by GitHub
parent c1b9a3d4c7
commit 71a5867a32
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/menu/menu.c
View file

@ -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); 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);
@ -98,12 +98,12 @@ menu_create(struct server *server, const char *id, const char *label)
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,
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); menu->items_tree = wlr_scene_tree_create(menu->scene_tree);
wlr_scene_node_set_position(&menu->items_tree->node, wlr_scene_node_set_position(&menu->items_tree->node,
server->theme->menu_border_width, 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; 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,
@ -156,8 +156,8 @@ menu_update_width(struct menu *menu)
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);
/* /*
@ -273,11 +273,11 @@ item_create(struct menu *menu, const char *text, bool show_arrow)
menuitem->native_width += font_width(&rc.font_menuitem, arrow); menuitem->native_width += font_width(&rc.font_menuitem, arrow);
} }
/* Menu item root node */ /* Menu item root node */
menuitem->tree = wlr_scene_tree_create(menu->items_tree); menuitem->tree = wlr_scene_tree_create(menu->items_tree);
node_descriptor_create(&menuitem->tree->node, node_descriptor_create(&menuitem->tree->node,
LAB_NODE_DESC_MENUITEM, menuitem); LAB_NODE_DESC_MENUITEM, menuitem);
/* Tree for each state to hold background and text buffer */ /* Tree for each state to hold background and text buffer */
menuitem->normal.tree = wlr_scene_tree_create(menuitem->tree); menuitem->normal.tree = wlr_scene_tree_create(menuitem->tree);
menuitem->selected.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; : LAB_MENU_TITLE;
struct server *server = menu->server; struct server *server = menu->server;
struct theme *theme = server->theme; struct theme *theme = server->theme;
if (menuitem->type == LAB_MENU_TITLE) { if (menuitem->type == LAB_MENU_TITLE) {
menuitem->height = theme->menu_item_height; menuitem->height = theme->menu_item_height;
menuitem->native_width = font_width(&rc.font_menuheader, label); 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, * Destroying the root node will destroy everything,
* including node descriptors and scaled_font_buffers. * including node descriptors and scaled_font_buffers.
*/ */
wlr_scene_node_destroy(&menu->border->node); wlr_scene_node_destroy(&menu->border->node);
wlr_scene_node_destroy(&menu->background->node); wlr_scene_node_destroy(&menu->background->node);
wlr_scene_node_destroy(&menu->items_tree->node); wlr_scene_node_destroy(&menu->items_tree->node);
wlr_scene_node_destroy(&menu->scene_tree->node); wlr_scene_node_destroy(&menu->scene_tree->node);
wl_list_remove(&menu->link); wl_list_remove(&menu->link);
zfree(menu->id); zfree(menu->id);
zfree(menu->label); zfree(menu->label);