From: tokyo4j <hrak1529@gmail.com>
Date: Thu, 14 Aug 2025 17:38:02 +0000 (+0900)
Subject: menu: allow overwriting submenu icon
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=72e1945a4cc64080f1a544d81f84c51d5f4f6101;p=proto%2Flabwc.git

menu: allow overwriting submenu icon

Allow overwriting the icon of item linking to another menu like below
(the icon for "krita" should be shown):

<openbox_menu>
  <menu id="static-menu" label="Static Menu" icon="mpv" />
  <menu id="root-menu" label="Root">
    <menu id="static-menu" icon="krita" />
  </menu>
</openbox_menu>

This commit also fixes my mistake in 17d66e5 (s/parent->icon/menu->icon/)
that showed incorrect icon in an item linking to another menu.
---

diff --git a/src/menu/menu.c b/src/menu/menu.c
index 0009861d..69527ce0 100644
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -613,7 +613,7 @@ fill_menu(struct server *server, struct menu *parent, xmlNode *n)
 		}
 
 		struct menuitem *item = item_create(parent, menu->label,
-			parent->icon_name, true);
+			icon_name ? icon_name : menu->icon_name, true);
 		item->submenu = menu;
 	}
 error: