summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2013-10-29 08:04:05 +0000
committerChris Michael <cp.michael@samsung.com>2013-10-29 08:05:32 +0000
commit49dfea556657baed6cfbd8bc4c8389b79c3858aa (patch)
treee761e305c4f10ab34beda898e9b07b0f3eec808b /src/modules
parentd1d0090706274025e9be85e15eb7da7537252641 (diff)
If mouse is already inside the ecore_evas, then we don't need to call
the mouse_in function of the ecore_evas. Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 15bb93c580..45832f0170 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -101,11 +101,9 @@ _ecore_evas_wl_common_cb_mouse_in(void *data EINA_UNUSED, int type EINA_UNUSED,
101 ee = ecore_event_window_match(ev->window); 101 ee = ecore_event_window_match(ev->window);
102 if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; 102 if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
103 if (ev->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON; 103 if (ev->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
104 if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee); 104 if (ee->in) return ECORE_CALLBACK_PASS_ON;
105
106 if (ee->in)
107 return ECORE_CALLBACK_PASS_ON;
108 105
106 if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee);
109 ecore_event_evas_modifier_lock_update(ee->evas, ev->modifiers); 107 ecore_event_evas_modifier_lock_update(ee->evas, ev->modifiers);
110 evas_event_feed_mouse_in(ee->evas, ev->timestamp, NULL); 108 evas_event_feed_mouse_in(ee->evas, ev->timestamp, NULL);
111 _ecore_evas_mouse_move_process(ee, ev->x, ev->y, ev->timestamp); 109 _ecore_evas_mouse_move_process(ee, ev->x, ev->y, ev->timestamp);
@@ -125,6 +123,7 @@ _ecore_evas_wl_common_cb_mouse_out(void *data EINA_UNUSED, int type EINA_UNUSED,
125 ee = ecore_event_window_match(ev->window); 123 ee = ecore_event_window_match(ev->window);
126 if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; 124 if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
127 if (ev->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON; 125 if (ev->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
126
128 if (ee->in) 127 if (ee->in)
129 { 128 {
130 ecore_event_evas_modifier_lock_update(ee->evas, ev->modifiers); 129 ecore_event_evas_modifier_lock_update(ee->evas, ev->modifiers);