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

move menu mouse-up feed util function to E_API in comp canvas

This commit is contained in:
Mike Blumenkrantz 2015-08-05 17:26:50 -04:00
parent b7cc0e07b8
commit f2f4b65ead
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/e_comp_canvas.c
View File

@ -693,3 +693,16 @@ e_comp_canvas_keys_ungrab(void)
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
e_bindings_key_ungrab(E_BINDING_CONTEXT_ANY, e_comp->root);
}
E_API void
e_comp_canvas_feed_mouse_up(unsigned int activate_time)
{
int button_mask, i;
button_mask = evas_pointer_button_down_mask_get(e_comp->evas);
for (i = 0; i < 32; i++)
{
if ((button_mask & (1 << i)))
evas_event_feed_mouse_up(e_comp->evas, i + 1, EVAS_BUTTON_NONE, activate_time, NULL);
}
}

1
src/bin/e_comp_canvas.h
View File

@ -27,6 +27,7 @@ E_API unsigned int e_comp_canvas_client_layer_map(E_Layer layer);
E_API E_Layer e_comp_canvas_client_layer_map_nearest(int layer);
E_API void e_comp_canvas_keys_grab(void);
E_API void e_comp_canvas_keys_ungrab(void);
E_API void e_comp_canvas_feed_mouse_up(unsigned int activate_time);
/* the following functions are used for adjusting root window coordinates
* to/from canvas coordinates.

15
src/bin/e_menu.c
View File

@ -103,19 +103,6 @@ static int _e_menu_autoscroll_y = 0;
static Eina_List *handlers = NULL;
static Eina_Bool _e_menu_lock = EINA_FALSE;
static void
_mouse_up_feed(Evas *e, unsigned int activate_time)
{
int button_mask, i;
button_mask = evas_pointer_button_down_mask_get(e);
for (i = 0; i < 32; i++)
{
if ((button_mask & (1 << i)))
evas_event_feed_mouse_up(e, i + 1, EVAS_BUTTON_NONE, activate_time, NULL);
}
}
static Eina_List *
_e_active_menus_copy_ref(void)
{
@ -357,7 +344,7 @@ 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);
_mouse_up_feed(e_comp->evas, activate_time);
e_comp_canvas_feed_mouse_up(activate_time);
}
E_API void