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

Actually fix the separator positioning

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

20
src/menu/menu.c
View file

@ -147,13 +147,15 @@ menu_update_width(struct menu *menu)
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,
@ -254,7 +256,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;
@ -272,14 +274,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 */
menuitem->tree = wlr_scene_tree_create(menu->scene_tree);
node_descriptor_create(&menuitem->tree->node,
LAB_NODE_DESC_MENUITEM, menuitem);
/* 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);
@ -349,12 +348,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;
/* Menu item root node */
menuitem->tree = wlr_scene_tree_create(menu->items_tree);
node_descriptor_create(&menuitem->tree->node,
LAB_NODE_DESC_MENUITEM, menuitem);
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);
@ -364,7 +358,7 @@ separator_create(struct menu *menu, const char *label)
} }
/* Menu item root node */ /* Menu item root node */
menuitem->tree = wlr_scene_tree_create(menu->scene_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);