From 1a622a68ed5402632209c2861318f5df77450bae Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 4 Aug 2017 16:23:39 -0400 Subject: [PATCH] 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 e9fcd3024..9d93825d9 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