diff options
| author | Mike Blumenkrantz <m.blumenkran@samsung.com> | 2013-03-13 07:47:46 +0000 |
|---|---|---|
| committer | Mike Blumenkrantz <m.blumenkran@samsung.com> | 2013-03-13 07:47:46 +0000 |
| commit | f6dc33f6aa34f4b68a5f5439e85e5f59a27a2cf0 (patch) | |
| tree | d9a8bbff98c9fbbbdec6a6cd943f1dda11fa672f | |
| parent | a069797887735c25404c2dd6d96de639eab69671 (diff) | |
| download | enlightenment-f6dc33f6aa34f4b68a5f5439e85e5f59a27a2cf0.tar.gz | |
always deactivate all active menus when manually activating another window
| -rw-r--r-- | src/bin/e_menu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index eb57f1bda5..87f4581205 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); |