summaryrefslogtreecommitdiff
path: root/src/lib/ecore_evas
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-12-03 07:01:02 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-12-03 07:01:02 +0000
commite8610822712253b96392c8d35c4d21626d695ff9 (patch)
tree3f04ba4313d2e29bb260c3d696eb2e72b35cd5e7 /src/lib/ecore_evas
parenta81b41642fb9e65671d7942e9d6ee9b692dcbe72 (diff)
ecore: backport #79818
SVN revision: 80010
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r--src/lib/ecore_evas/ecore_evas_wayland_common.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/ecore_evas/ecore_evas_wayland_common.c b/src/lib/ecore_evas/ecore_evas_wayland_common.c
index f29e711166..5e83175932 100644
--- a/src/lib/ecore_evas/ecore_evas_wayland_common.c
+++ b/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