From: tokyo4j <hrak1529@gmail.com>
Date: Mon, 10 Mar 2025 07:49:35 +0000 (+0900)
Subject: menu: don't fill default items in empty menus
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=40dfee7bd5937924b5dea505d92a4baf0490bed5;p=proto%2Flabwc.git

menu: don't fill default items in empty menus

This is needed to prevent pipemenus which usually contains no items
from being filled with default items in follow-up commits.
---

diff --git a/src/menu/menu.c b/src/menu/menu.c
index 8139063c..f2de6609 100644
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -1085,8 +1085,6 @@ init_rootmenu(struct server *server)
 	if (!menu) {
 		current_menu = NULL;
 		menu = menu_create(server, "root-menu", "");
-	}
-	if (wl_list_empty(&menu->menuitems)) {
 		current_item = item_create(menu, _("Reconfigure"), false);
 		fill_item("name.action", "Reconfigure");
 		current_item = item_create(menu, _("Exit"), false);
@@ -1103,8 +1101,6 @@ init_windowmenu(struct server *server)
 	if (!menu) {
 		current_menu = NULL;
 		menu = menu_create(server, "client-menu", "");
-	}
-	if (wl_list_empty(&menu->menuitems)) {
 		current_item = item_create(menu, _("Minimize"), false);
 		fill_item("name.action", "Iconify");
 		current_item = item_create(menu, _("Maximize"), false);