From 33dfe6899c703a43adcd8925ff46d843385c37a6 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sat, 2 May 2020 15:20:51 +0100 Subject: [PATCH] menus - ensure submenus deacivate when parent does --- src/bin/e_menu.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index a9f42f0d2..aef1dda2a 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -459,9 +459,18 @@ e_menu_activate(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir) E_API void e_menu_deactivate(E_Menu *m) { + Eina_List *l; + E_Menu_Item *mi; + E_OBJECT_CHECK(m); E_OBJECT_TYPE_CHECK(m, E_MENU_TYPE); if (!m->active) return; + + EINA_LIST_FOREACH(m->items, l, mi) + { + if (mi->submenu) e_menu_deactivate(mi->submenu); + } + m->cur.visible = 0; m->active = 0; if (m->post_deactivate_cb.func)