styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e gadget - allow left mouse drag dnd to cancel long press menu

This commit is contained in:
Carsten Haitzler 2018-10-17 11:31:12 +01:00
parent 06ed527123
commit 571daf936d
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/e_gadget.c
View File

@ -1463,7 +1463,7 @@ _site_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo
E_Gadget_Config *zgc;
Evas_Object *g = NULL;
zgc = _gadget_at_xy(zgs, ev->canvas.x, ev->canvas.y, NULL);
zgc = _gadget_at_xy(zgs, zgs->down_3_x, zgs->down_3_y, NULL);
if (zgc) g = zgc->gadget;
if (zgs->context_cb) zgs->context_cb(zgs->layout, g, ev->timestamp);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
@ -1471,6 +1471,28 @@ _site_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo
}
}
static void
_site_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
{
E_Gadget_Site *zgs = data;
Evas_Event_Mouse_Move *ev = event_info;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
if (zgs->longpressed) return;
if (zgs->down_timer)
{
Evas_Coord dx, dy;
dx = ev->cur.canvas.x - zgs->down_1_x;
dy = ev->cur.canvas.y - zgs->down_1_y;
if (((dx * dx) + (dy * dy)) >= (5 * 5))
{
E_FREE_FUNC(zgs->down_timer, ecore_timer_del);
}
}
}
static void
_site_drop(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
{
@ -1749,6 +1771,7 @@ _site_create(E_Gadget_Site *zgs)
evas_object_show(zgs->events);
evas_object_event_callback_add(zgs->events, EVAS_CALLBACK_MOUSE_DOWN, _site_mouse_down, zgs);
evas_object_event_callback_add(zgs->events, EVAS_CALLBACK_MOUSE_UP, _site_mouse_up, zgs);
evas_object_event_callback_add(zgs->events, EVAS_CALLBACK_MOUSE_MOVE, _site_mouse_move, zgs);
if (!zgs->orient)
{
evas_object_event_callback_add(zgs->layout, EVAS_CALLBACK_SHOW, _site_visibility, zgs);