discomfitor pushed a commit to branch master.
commit f6dc33f6aa34f4b68a5f5439e85e5f59a27a2cf0
Author: Mike Blumenkrantz <[email protected]>
Date: Wed Mar 13 07:47:46 2013 +0000
always deactivate all active menus when manually activating another window
---
src/bin/e_menu.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index eb57f1b..87f4581 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -250,6 +250,7 @@ e_menu_activate_key(E_Menu *m, E_Zone *zone, int x, int y,
int w, int h, int dir
E_OBJECT_TYPE_CHECK(m, E_MENU_TYPE);
E_OBJECT_CHECK(zone);
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
+ if (_e_active_menus) e_menu_hide_all();
_e_menu_activate_time = 0;
_e_menu_activate_floating = 0;
_e_menu_activate_internal(m, zone);
@@ -324,6 +325,7 @@ e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int
y, int w, int h, int d
E_OBJECT_TYPE_CHECK(m, E_MENU_TYPE);
E_OBJECT_CHECK(zone);
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
+ if (_e_active_menus) e_menu_hide_all();
_e_menu_activate_time = activate_time;
_e_menu_activate_floating = 0;
_e_menu_activate_internal(m, zone);
@@ -388,6 +390,7 @@ e_menu_activate(E_Menu *m, E_Zone *zone, int x, int y, int
w, int h, int dir)
E_OBJECT_TYPE_CHECK(m, E_MENU_TYPE);
E_OBJECT_CHECK(zone);
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
+ if (_e_active_menus) e_menu_hide_all();
_e_menu_activate_time = 0;
_e_menu_activate_floating = 0;
_e_menu_activate_internal(m, zone);
--
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
