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

Don't send pointer_enter events on touch_down. 

Fix touch_down and touch_up to send proper button ID (ecore_x sends 0).

Fixes Phab Ticket T468

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2013-11-18 12:58:54 +00:00
parent 1f8789644b
commit d96339e9bb
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/ecore_wayland/ecore_wl_input.c
View File

@ -980,10 +980,10 @@ _ecore_wl_input_cb_touch_down(void *data, struct wl_touch *touch EINA_UNUSED, un
input->display->serial = serial;
input->sx = wl_fixed_to_int(x);
input->sy = wl_fixed_to_int(y);
_ecore_wl_input_mouse_move_send(input, input->pointer_focus, timestamp, id);
_ecore_wl_input_cb_pointer_enter(data, NULL, serial, surface, x, y);
/* _ecore_wl_input_mouse_move_send(input, input->pointer_focus, timestamp, id); */
/* _ecore_wl_input_cb_pointer_enter(data, NULL, serial, surface, x, y); */
_ecore_wl_input_mouse_down_send(input, input->pointer_focus,
id, BTN_LEFT, timestamp);
id, 0, timestamp);
}
static void
@ -1000,7 +1000,7 @@ _ecore_wl_input_cb_touch_up(void *data, struct wl_touch *touch EINA_UNUSED, unsi
/* input->timestamp = timestamp; */
input->display->serial = serial;
_ecore_wl_input_mouse_up_send(input, input->pointer_focus,
id, BTN_LEFT, timestamp);
id, 0, timestamp);
}
static void
@ -1017,7 +1017,6 @@ _ecore_wl_input_cb_touch_motion(void *data, struct wl_touch *touch EINA_UNUSED,
/* input->timestamp = timestamp; */
input->sx = wl_fixed_to_int(x);
input->sy = wl_fixed_to_int(y);
_ecore_wl_input_mouse_move_send(input, input->pointer_focus, timestamp, id);
}