From 7379bc005cf8a4693777b48f513b5195783b3b6f Mon Sep 17 00:00:00 2001 From: sebastid Date: Thu, 21 Apr 2005 07:45:39 +0000 Subject: [PATCH] Call submenu_post_cb on deactivate SVN revision: 14273 --- src/bin/e_menu.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 3d12f38..460eaee 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -37,6 +37,7 @@ static void _e_menu_activate_internal (E_Menu *m, E_Zone *zone); static void _e_menu_deactivate_all (void); static void _e_menu_deactivate_above (E_Menu *m); static void _e_menu_submenu_activate (E_Menu_Item *mi); +static void _e_menu_submenu_deactivate (E_Menu_Item *mi); static void _e_menu_reposition (E_Menu *m); static int _e_menu_active_call (void); static void _e_menu_item_activate_next (void); @@ -566,6 +567,7 @@ e_menu_item_active_set(E_Menu_Item *mi, int active) if (mi->icon_key) edje_object_signal_emit(mi->icon_object, "passive", ""); edje_object_signal_emit(mi->menu->bg_object, "passive", ""); + _e_menu_submenu_deactivate(mi); } } @@ -1471,6 +1473,12 @@ _e_menu_submenu_activate(E_Menu_Item *mi) _e_menu_reposition(m); e_object_unref(E_OBJECT(m)); } +} + +static void +_e_menu_submenu_deactivate(E_Menu_Item *mi) +{ + if (mi->menu->active) return; if (mi->submenu_post_cb.func) mi->submenu_post_cb.func(mi->submenu_post_cb.data, mi->menu, mi); } -- 2.7.4