[EGIT] [core/enlightenment] master 02/02: replace all occurrences of cursor setting with calls to pointer util function

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=ee530798f060e568dacaf327bcfde1481a2e7de0

commit ee530798f060e568dacaf327bcfde1481a2e7de0
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Feb 9 12:24:31 2015 -0500

    replace all occurrences of cursor setting with calls to pointer util 
function
---
 src/bin/e_comp_wl.c       | 6 +-----
 src/bin/e_comp_wl_input.c | 3 +--
 src/bin/e_pointer.c       | 3 +--
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 362224d..c042ddb 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -205,11 +205,7 @@ _e_comp_wl_evas_cb_mouse_out(void *data, Evas *evas 
EINA_UNUSED, Evas_Object *ob
 
       ecore_evas_cursor_get(e_comp->ee, &o, NULL, NULL, NULL);
       if (e_comp->pointer->o_ptr != o)
-        {
-           ecore_evas_cursor_unset(e_comp->ee);
-           ecore_evas_object_cursor_set(e_comp->ee, e_comp->pointer->o_ptr,
-             EVAS_LAYER_MAX, e_comp->pointer->hot.x, e_comp->pointer->hot.y);
-        }
+        e_pointer_object_set(e_comp->pointer, NULL, 0, 0);
    }
    if (e_object_is_del(E_OBJECT(ec))) return;
 
diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index 57f8dd0..baab45a 100644
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -49,8 +49,7 @@ _e_comp_wl_input_pointer_cb_cursor_set(struct wl_client 
*client, struct wl_resou
      }
    /* ignore cursor changes during resize/move I guess */
    if (e_client_action_get()) return;
-   ecore_evas_cursor_unset(e_comp->ee);
-   ecore_evas_object_cursor_set(e_comp->ee, ec->frame, EVAS_LAYER_MAX, x, y);
+   e_pointer_object_set(e_comp->pointer, ec->frame, x, y);
 }
 
 static const struct wl_pointer_interface _e_pointer_interface = 
diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index ac70439..bbc475a 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -386,8 +386,7 @@ _e_pointer_type_set(E_Pointer *ptr, const char *type)
         _e_pointer_hot_update(ptr, x, y);
 
         if (ptr->canvas)
-          ecore_evas_object_cursor_set(ptr->ee, ptr->o_ptr, EVAS_LAYER_MAX, 
-                                       ptr->hot.x, ptr->hot.y);
+          e_pointer_object_set(ptr, NULL, 0, 0);
         else
           evas_object_show(ptr->o_ptr);
 

--