mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-02 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

menu: allow client-{list-combined,send-to}-menu as submenu of static menu

Browse source 
Also, their labels are changed to "Windows" and "Send to desktop" which
are the same as Openbox.
This commit is contained in:
tokyo4j 2025-08-13 23:52:24 +09:00 • committed by Johan Malm
parent 01a7ac7995
commit 2ce3f39c1f
1 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/menu/menu.c
View file

@ -814,13 +814,6 @@ menu_hide_submenu(struct server *server, const char *id)
} }
} }
static void
init_client_send_to_menu(struct server *server)
{
/* Just create placeholder. Contents will be created when launched */
menu_create(server, NULL, "client-send-to-menu", "");
}
static struct action * static struct action *
item_add_action(struct menuitem *item, const char *action_name) item_add_action(struct menuitem *item, const char *action_name)
{ {
@ -866,13 +859,6 @@ update_client_send_to_menu(struct server *server)
menu_create_scene(menu); menu_create_scene(menu);
} }
static void
init_client_list_combined_menu(struct server *server)
{
/* Just create placeholder. Contents will be created when launched */
menu_create(server, NULL, "client-list-combined-menu", "");
}
/* /*
* This is client-list-combined-menu an internal menu similar to root-menu and * This is client-list-combined-menu an internal menu similar to root-menu and
* client-menu. * client-menu.
@ -1010,11 +996,14 @@ void
menu_init(struct server *server) menu_init(struct server *server)
{ {
wl_list_init(&server->menus); wl_list_init(&server->menus);
/* Just create placeholder. Contents will be created when launched */
menu_create(server, NULL, "client-list-combined-menu", _("Windows"));
menu_create(server, NULL, "client-send-to-menu", _("Send to desktop"));
parse_xml("menu.xml", server); parse_xml("menu.xml", server);
init_rootmenu(server); init_rootmenu(server);
init_windowmenu(server); init_windowmenu(server);
init_client_list_combined_menu(server);
init_client_send_to_menu(server);
validate(server); validate(server);
} }