enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

defer menu activation mouse-up feed 

ensure that this is not triggered from an evas post event callback

ref T3144
This commit is contained in:
Mike Blumenkrantz 2017-03-03 11:56:16 -05:00
parent d29fb6b0b5
commit 41476f8f3e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/e_menu.c
View File

@ -103,6 +103,9 @@ static int _e_menu_autoscroll_y = 0;
static Eina_List *handlers = NULL;
static Eina_Bool _e_menu_lock = EINA_FALSE;
static Eina_Bool pending_feed;
static unsigned int pending_activate_time;
static Eina_List *
_e_active_menus_copy_ref(void)
{
@ -346,7 +349,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);
e_comp_canvas_feed_mouse_up(activate_time);
pending_feed = 1;
pending_activate_time = activate_time;
}
E_API void
@ -1087,6 +1091,12 @@ e_menu_idler_before(void)
Eina_List *l, *removals = NULL, *tmp;
E_Menu *m;
if (pending_feed)
{
e_comp_canvas_feed_mouse_up(pending_activate_time);
pending_feed = 0;
}
/* add refcount to all menus we will work with */
tmp = _e_active_menus_copy_ref();
/* phase 1. hide all the menus that want to be hidden */