forked from enlightenment/enlightenment
make mouse-activated menus function as expected with 0 passed as activate time
This commit is contained in:
parent
d5251d3b5a
commit
5964b2cf41
|
@ -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_CHECK(zone);
|
||||||
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
|
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
|
||||||
if (_e_active_menus) e_menu_hide_all();
|
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_floating = 0;
|
||||||
_e_menu_activate_internal(m, zone);
|
_e_menu_activate_internal(m, zone);
|
||||||
if (!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();
|
pmi = _e_menu_item_active_get();
|
||||||
if (pmi) e_menu_item_active_set(pmi, 0);
|
if (pmi) e_menu_item_active_set(pmi, 0);
|
||||||
pending_feed = 1;
|
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
|
E_API void
|
||||||
|
|
Loading…
Reference in New Issue