rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=3aac2ec771f4153c41da0d9c47bea5b47370358c
commit 3aac2ec771f4153c41da0d9c47bea5b47370358c Author: Vyacheslav Reutskiy <[email protected]> Date: Mon May 30 18:28:39 2016 +0300 cursor: support mix of system and eflete cursors Change-Id: If2852f7725f5c8f022f47109dc4076a2d79e7608 --- src/bin/ui/cursor.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/bin/ui/cursor.c b/src/bin/ui/cursor.c index 84032b5..e8c6b38 100644 --- a/src/bin/ui/cursor.c +++ b/src/bin/ui/cursor.c @@ -91,6 +91,9 @@ _eflete_cursor_mouse_in(void *data __UNUSED__, if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; cursor = evas_object_data_get(obj, CURSOR_KEY); + + assert(cursor != NULL); + cur_obj = _cursor_object_get(obj, cursor->type); _ecore_evas_cursor_set(cursor->ee, cur_obj); } @@ -104,15 +107,23 @@ _eflete_cursor_mouse_out(void *data __UNUSED__, Evas_Event_Mouse_Out *ev; Cursor *cursor; Evas_Object *cur_obj; + Ecore_Evas *ee; ev = (Evas_Event_Mouse_Out *)event_info; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; cursor = evas_object_data_get(obj, CURSOR_KEY); cursor = ecore_evas_data_get(cursor->ee, CURSOR_KEY); - cur_obj = _cursor_object_get(obj, cursor->type); - - _ecore_evas_cursor_set(cursor->ee, cur_obj); + if (cursor) + { + cur_obj = _cursor_object_get(obj, cursor->type); + _ecore_evas_cursor_set(cursor->ee, cur_obj); + } + else + { + ee = ecore_evas_ecore_evas_get(e); + ecore_evas_cursor_set(ee, NULL, ELM_OBJECT_LAYER_CURSOR, 0, 0); + } } static void --
