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

final spacing cleanups?

Browse source
This commit is contained in:
David Barr 2024-10-17 14:06:40 +01:00 • committed by GitHub
parent b1f9619822
commit 387555f780
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/menu/menu.c
View file

@ -103,7 +103,7 @@ 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);
/* 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,
@ -139,7 +139,7 @@ menu_update_width(struct menu *menu)
if (item->native_width > max_width) { if (item->native_width > max_width) {
max_width = item->native_width < theme->menu_max_width max_width = item->native_width < theme->menu_max_width
? item->native_width : theme->menu_max_width; ? item->native_width : theme->menu_max_width;
} }
} }
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 */
@ -255,7 +255,7 @@ item_create(struct menu *menu, const char *text, bool show_arrow)
{ {
assert(menu); assert(menu);
assert(text); assert(text);
struct menuitem *menuitem = znew(*menuitem); struct menuitem *menuitem = znew(*menuitem);
menuitem->parent = menu; menuitem->parent = menu;
menuitem->selectable = true; menuitem->selectable = true;
@ -277,7 +277,7 @@ item_create(struct menu *menu, const char *text, bool show_arrow)
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,9 +1187,9 @@ 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);