[EGIT] [core/efl] master 02/02: elm win: only set wl cursors on mouse in to the window area

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=2119a74a5d5e9222ebaaca89a3f546e28bee22b2

commit 2119a74a5d5e9222ebaaca89a3f546e28bee22b2
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Wed Jun 22 11:17:36 2016 -0400

    elm win: only set wl cursors on mouse in to the window area
    
    in the case of csd regions, canvas mouse in != window mouse in
    
    ref T3819
---
 src/lib/elementary/efl_ui_win.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 320be9a..26876e4 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -908,7 +908,7 @@ _elm_win_mouse_in(Ecore_Evas *ee)
    _elm_win_throttle_ok = EINA_TRUE;
    if (sd->resizing) sd->resizing = EINA_FALSE;
 #ifdef HAVE_ELEMENTARY_WL2
-   if (sd->wl.win)
+   if (sd->wl.win && (!sd->frame_obj))
      ecore_wl2_window_cursor_from_name_set(sd->wl.win, NULL);
 #endif
 }
@@ -3374,6 +3374,19 @@ static struct _resize_info _border_corner[4] =
 #endif
 
 static void
+_elm_win_frame_obj_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+#ifdef HAVE_ELEMENTARY_WL2
+   Efl_Ui_Win_Data *sd = data;
+
+   if (sd->wl.win)
+     ecore_wl2_window_cursor_from_name_set(sd->wl.win, NULL);
+#else
+   (void)data;
+#endif
+}
+
+static void
 _elm_win_frame_obj_move(void *data,
                         Evas *e EINA_UNUSED,
                         Evas_Object *obj EINA_UNUSED,
@@ -3647,6 +3660,8 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *style)
                             sd->icon);
 
    evas_object_event_callback_add
+     (sd->frame_obj, EVAS_CALLBACK_MOUSE_IN, _elm_win_frame_obj_mouse_in, sd);
+   evas_object_event_callback_add
      (sd->frame_obj, EVAS_CALLBACK_MOVE, _elm_win_frame_obj_move, sd);
    evas_object_event_callback_add
      (sd->frame_obj, EVAS_CALLBACK_RESIZE, _elm_win_frame_obj_resize, sd);

--