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

ecore-wl2: Fix dnd to function when source window and target window 

are same

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-10-09 11:41:07 -04:00
parent aa232d0a61
commit 2be0a40129
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/ecore_wl2/ecore_wl2_dnd.c
View File

@ -118,6 +118,8 @@ _source_cb_cancelled(void *data, struct wl_data_source *source)
if (input->focus.keyboard)
ev->source = input->focus.keyboard->id;
if (!ev->win) ev->win = ev->source;
ecore_event_add(ECORE_WL2_EVENT_DATA_SOURCE_CANCELLED, ev, NULL, NULL);
}
@ -310,6 +312,8 @@ _ecore_wl2_dnd_enter(Ecore_Wl2_Input *input, struct wl_data_offer *offer, struct
if (input->focus.keyboard)
ev->source = input->focus.keyboard->id;
if (!ev->win) ev->win = ev->source;
ev->x = x;
ev->y = y;
ev->offer = offer;
@ -333,6 +337,8 @@ _ecore_wl2_dnd_leave(Ecore_Wl2_Input *input)
if (input->focus.keyboard)
ev->source = input->focus.keyboard->id;
if (!ev->win) ev->win = ev->source;
ecore_event_add(ECORE_WL2_EVENT_DND_LEAVE, ev, NULL, NULL);
}
@ -352,6 +358,8 @@ _ecore_wl2_dnd_motion(Ecore_Wl2_Input *input, int x, int y, unsigned int timesta
if (input->focus.keyboard)
ev->source = input->focus.keyboard->id;
if (!ev->win) ev->win = ev->source;
ev->x = x;
ev->y = y;
ev->serial = timestamp;
@ -373,6 +381,8 @@ _ecore_wl2_dnd_drop(Ecore_Wl2_Input *input)
ev->win = input->focus.pointer->id;
if (input->focus.keyboard)
ev->source = input->focus.keyboard->id;
if (!ev->win) ev->win = ev->source;
}
ev->x = input->pointer.sx;
@ -523,6 +533,8 @@ ecore_wl2_dnd_drag_end(Ecore_Wl2_Input *input)
if (input->focus.keyboard)
ev->source = input->focus.keyboard->id;
if (!ev->win) ev->win = ev->source;
ecore_event_add(ECORE_WL2_EVENT_DND_END, ev, NULL, NULL);
}