[EGIT] [core/enlightenment] enlightenment-0.21 12/50: make mouse-activated menus function as expected with 0 passed as activate time

[Mike Blumenkrantz]

discomfitor pushed a commit to branch enlightenment-0.21.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=5964b2cf417276da36ec509c4e54a9157587d26b

commit 5964b2cf417276da36ec509c4e54a9157587d26b
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Aug 4 16:23:39 2017 -0400

    make mouse-activated menus function as expected with 0 passed as activate 
time
---
 src/bin/e_menu.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 47920670e..e2002dbbf 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -296,7 +296,7 @@ e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int 
y, int w, int h, int d
    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_time = 0;
    _e_menu_activate_floating = 0;
    _e_menu_activate_internal(m, zone);
    if (!m->zone)
@@ -350,7 +350,8 @@ e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int 
y, int w, int h, int d
    pmi = _e_menu_item_active_get();
    if (pmi) e_menu_item_active_set(pmi, 0);
    pending_feed = 1;
-   pending_activate_time = activate_time;
+   if (!activate_time) activate_time = lround(ecore_loop_time_get() * 1000);
+   _e_menu_activate_time = pending_activate_time = activate_time;
 }
 
 E_API void

--