e_pointer: add nocomp end condition when cursor is shown

Change-Id: Id3284c09a1a800d0ff305ec1d90150614aed6076

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 1d0835834ad4dba479367df531efbaa03b2a5aef..0e217374a4c142638faaccb49bcca7730fcf3be5 100644 (file)
--- 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 c80b605db6599c1b5b876951eabac92bf7cc3e9e..2fe55672b56760fb26e14dc529f80cded1b4cb35 100644 (file)
--- 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)))