Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_menu.c 


Log Message:
Call submenu_post_cb on deactivate

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_menu.c    21 Apr 2005 07:19:49 -0000      1.17
+++ e_menu.c    21 Apr 2005 07:45:39 -0000      1.18
@@ -37,6 +37,7 @@
 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 @@
        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_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);
 }




-------------------------------------------------------
This SF.Net email is sponsored by: New Crystal Reports XI.
Version 11 adds new functionality designed to reduce time involved in
creating, integrating, and deploying reporting solutions. Free runtime info,
new features, or free trial, at: http://www.businessobjects.com/devxi/728
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to