If mouse is already inside the ecore_evas, then we don't need to call
authorChris Michael <cp.michael@samsung.com>
Tue, 29 Oct 2013 08:04:05 +0000 (08:04 +0000)
committerChris Michael <cp.michael@samsung.com>
Tue, 29 Oct 2013 08:05:32 +0000 (08:05 +0000)
the mouse_in function of the ecore_evas.

Signed-off-by: Chris Michael <cp.michael@samsung.com>
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c

index 15bb93c580d76bfff7d66251c6c0825d1b71c49b..45832f01700587ebc8b70dfdadd43120eab91259 100644 (file)
@@ -101,11 +101,9 @@ _ecore_evas_wl_common_cb_mouse_in(void *data EINA_UNUSED, int type EINA_UNUSED,
    ee = ecore_event_window_match(ev->window);
    if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
    if (ev->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
-   if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee);
-
-   if (ee->in)
-     return ECORE_CALLBACK_PASS_ON;
+   if (ee->in) return ECORE_CALLBACK_PASS_ON;
 
+   if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee);
    ecore_event_evas_modifier_lock_update(ee->evas, ev->modifiers);
    evas_event_feed_mouse_in(ee->evas, ev->timestamp, NULL);
    _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,
    ee = ecore_event_window_match(ev->window);
    if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
    if (ev->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+
    if (ee->in)
      {
         ecore_event_evas_modifier_lock_update(ee->evas, ev->modifiers);