rvandegrift
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace all occurrences of cursor setting with calls to pointer util function

This commit is contained in:
Mike Blumenkrantz 2015-02-09 12:24:31 -05:00
parent 2a1525bdb0
commit ee530798f0
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_comp_wl.c
View File

@ -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;

3
src/bin/e_comp_wl_input.c
View File

@ -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 =

3
src/bin/e_pointer.c
View File

@ -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);