From 20cc641b09a7c8be7394769f5d346154b453da09 Mon Sep 17 00:00:00 2001 From: Juyeon Lee Date: Tue, 31 May 2016 18:08:34 +0900 Subject: [PATCH] e_pointer: add nocomp end condition when cursor is shown Change-Id: Id3284c09a1a800d0ff305ec1d90150614aed6076 --- src/bin/e_comp.c | 5 +++++ src/bin/e_pointer.c | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 1d08358..0e21737 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -131,6 +131,11 @@ _e_comp_fullscreen_check(void) { E_Client *ec; + if (!e_pointer_is_hidden(e_comp->pointer)) + { + return NULL; + } + E_CLIENT_REVERSE_FOREACH(ec) { E_Comp_Wl_Client_Data *cdata = (E_Comp_Wl_Client_Data*)ec->comp_data; diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c index c80b605..2fe5567 100644 --- a/src/bin/e_pointer.c +++ b/src/bin/e_pointer.c @@ -732,6 +732,10 @@ e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int y) if (o == obj) { ecore_evas_object_cursor_set(ptr->ee, obj, E_LAYER_MAX - 1, x, y); + if (e_pointer_is_hidden(ptr)) + { + e_comp_nocomp_end("re_cursor_set"); + } return; } ec = e_comp_object_client_get(o); @@ -749,6 +753,11 @@ e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int y) } else if (ptr->o_ptr) ecore_evas_object_cursor_set(ptr->ee, ptr->o_ptr, E_LAYER_MAX - 1, ptr->hot.x, ptr->hot.y); + + if (e_pointer_is_hidden(ptr)) + { + e_comp_nocomp_end("cursor_set"); + } } E_API void @@ -773,7 +782,10 @@ e_pointer_is_hidden(E_Pointer *ptr) ecore_evas_cursor_get(ptr->ee, &o, NULL, NULL, NULL); if (o) - return EINA_FALSE; + { + if (evas_object_visible_get(o)) + return EINA_FALSE; + } else { if (ptr->o_ptr && (evas_object_visible_get(ptr->o_ptr))) -- 2.7.4