summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Wu <zhiwen.wu@linux.intel.com>2012-11-29 07:46:14 +0000
committerChristopher Michael <cpmichael1@comcast.net>2012-11-29 07:46:14 +0000
commit11cb458f48095d5352b0c08dff59905b2e99aa00 (patch)
tree525436f229b41c5473ae321a57ff194220374fdb
parent830858b9f72fef55d3617bda439d5b3999b4a0b0 (diff)
From: Alex Wu <zhiwen.wu@linux.intel.com>
Every touch down event should be converted into mouse in + mouse button. So we should let every mouse in event go in the _ecore_evas_wl_common_cb_mouse_in(), instead of preventing it by "if (!ee->in)". Besides that, the coordinates carried by mouse in event should be set to Evas_Public_Data::pointer by calling _ecore_evas_mouse_move_process(). Signed-off-by: Christopher Michael <cp.michael@samsung.com> SVN revision: 79818
-rw-r--r--legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_common.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_common.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_common.c
index f29e711166..5e83175932 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_common.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_common.c
@@ -43,13 +43,11 @@ _ecore_evas_wl_common_cb_mouse_in(void *data EINA_UNUSED, int type EINA_UNUSED,
43 ee = ecore_event_window_match(ev->window); 43 ee = ecore_event_window_match(ev->window);
44 if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; 44 if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
45 if (ev->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON; 45 if (ev->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
46 if (!ee->in) 46 if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee);
47 { 47 ecore_event_evas_modifier_lock_update(ee->evas, ev->modifiers);
48 if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee); 48 evas_event_feed_mouse_in(ee->evas, ev->timestamp, NULL);
49 ecore_event_evas_modifier_lock_update(ee->evas, ev->modifiers); 49 _ecore_evas_mouse_move_process(ee, ev->x, ev->y, ev->timestamp);
50 evas_event_feed_mouse_in(ee->evas, ev->timestamp, NULL); 50 ee->in = EINA_TRUE;
51 ee->in = EINA_TRUE;
52 }
53 return ECORE_CALLBACK_PASS_ON; 51 return ECORE_CALLBACK_PASS_ON;
54} 52}
55 53