mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/menu/menu.c: convert to wl_list_append()

Browse source
This commit is contained in:
Consolatis 2023-08-30 02:37:08 +02:00 • committed by Johan Malm
parent a49e12e112
commit a9ab8ebdaf
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/menu/menu.c
View file

@ -232,7 +232,7 @@ item_create(struct menu *menu, const char *text, bool show_arrow)
/* Update menu extents */ /* Update menu extents */
menu->size.height += menuitem->height; menu->size.height += menuitem->height;
wl_list_insert(&menu->menuitems, &menuitem->link); wl_list_append(&menu->menuitems, &menuitem->link);
wl_list_init(&menuitem->actions); wl_list_init(&menuitem->actions);
return menuitem; return menuitem;
} }
@ -272,7 +272,7 @@ separator_create(struct menu *menu, const char *label)
theme->menu_separator_padding_height); theme->menu_separator_padding_height);
menu->size.height += menuitem->height; menu->size.height += menuitem->height;
wl_list_insert(&menu->menuitems, &menuitem->link); wl_list_append(&menu->menuitems, &menuitem->link);
wl_list_init(&menuitem->actions); wl_list_init(&menuitem->actions);
return menuitem; return menuitem;
} }
@ -571,7 +571,7 @@ menu_get_full_width(struct menu *menu)
int child_width; int child_width;
int max_child_width = 0; int max_child_width = 0;
struct menuitem *item; struct menuitem *item;
wl_list_for_each_reverse(item, &menu->menuitems, link) { wl_list_for_each(item, &menu->menuitems, link) {
if (!item->submenu) { if (!item->submenu) {
continue; continue;
} }
@ -636,7 +636,7 @@ menu_configure(struct menu *menu, int lx, int ly, enum menu_align align)
int rel_y; int rel_y;
int new_lx, new_ly; int new_lx, new_ly;
struct menuitem *item; struct menuitem *item;
wl_list_for_each_reverse(item, &menu->menuitems, link) { wl_list_for_each(item, &menu->menuitems, link) {
if (!item->submenu) { if (!item->submenu) {
continue; continue;
} }
@ -663,7 +663,7 @@ menu_hide_submenu(const char *id)
menu = menus + i; menu = menus + i;
bool should_reposition = false; bool should_reposition = false;
struct menuitem *item, *next; struct menuitem *item, *next;
wl_list_for_each_reverse_safe(item, next, &menu->menuitems, link) { wl_list_for_each_safe(item, next, &menu->menuitems, link) {
if (item->submenu == hide_menu) { if (item->submenu == hide_menu) {
item_destroy(item); item_destroy(item);
should_reposition = true; should_reposition = true;
@ -675,7 +675,7 @@ menu_hide_submenu(const char *id)
} }
/* Re-position items vertically */ /* Re-position items vertically */
menu->size.height = 0; menu->size.height = 0;
wl_list_for_each_reverse(item, &menu->menuitems, link) { wl_list_for_each(item, &menu->menuitems, link) {
wlr_scene_node_set_position(&item->tree->node, 0, wlr_scene_node_set_position(&item->tree->node, 0,
menu->size.height); menu->size.height);
menu->size.height += item->height; menu->size.height += item->height;