e_desk_area: use e_desk_area_enable_set

instead of e_client_desk_area_set

Change-Id: I5cb2dc90fd1ce932da47daf7c1e06d16e57c0341

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 984ac99..dff60e1 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -8414,6 +8414,8 @@ e_client_desk_area_client_layer_get(E_Client *ec)
    return ec->desk_area.edgc_layer;
 }
 
+#ifdef REFACTOR_ZONE_DESK
+#else
 EINTERN Eina_Bool
 e_client_desk_area_enable_set(E_Client *ec, Eina_Bool enable)
 {
@@ -8443,6 +8445,7 @@ e_client_desk_area_enable_set(E_Client *ec, Eina_Bool enable)
    e_desk_area_ec_update(ec->desk_area.desk_area, ec);
    return EINA_TRUE;
 }
+#endif
 
 //FIXME: use e_desk_area_ec_reassign(eda, ec) instead of this api
 E_API Eina_Bool

diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index 55a6017..1fcddc3 100644 (file)
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -1300,7 +1300,10 @@ EINTERN void e_client_desk_area_original_layer_restore(E_Client *ec);
 EINTERN E_Layer e_client_desk_area_original_layer_get(E_Client *ec);
 EINTERN Eina_Bool e_client_desk_area_client_layer_set(E_Client *ec, E_Desk_Area_Client_Layer edgc_layer);
 EINTERN E_Desk_Area_Client_Layer e_client_desk_area_client_layer_get(E_Client *ec);
+//#ifdef REFACTOR_ZONE_DESK
+//#else
 EINTERN Eina_Bool e_client_desk_area_enable_set(E_Client *ec, Eina_Bool enable);
+//#endif
 
 E_API Eina_Bool e_client_desk_area_set(E_Client *ec, E_Desk_Area *eda);
 

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 5bdc50a..bf43ad7 100644 (file)
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -783,7 +783,7 @@ _e_desk_client_set(E_Desk *desk, E_Client *ec)
              e_desk_area_ec_reassign(eda, ec);
           }
 
-        e_client_desk_area_enable_set(ec, EINA_TRUE);
+        e_desk_area_ec_enable_set(desk->desk_area.base, ec, EINA_TRUE);
      }
 }
 #endif

diff --git a/src/bin/e_desk_area.c b/src/bin/e_desk_area.c
index 2c15477..edad0b6 100644 (file)
--- a/src/bin/e_desk_area.c
+++ b/src/bin/e_desk_area.c
@@ -284,7 +284,7 @@ void _e_desk_area_enable(E_Desk_Area *eda)
         list = eina_list_clone(eda->ec_lists[i]);
         EINA_LIST_REVERSE_FOREACH(list, l, ec)
           {
-             e_client_desk_area_enable_set(ec, EINA_TRUE);
+             e_desk_area_ec_enable_set(eda, ec, EINA_TRUE);
           }
         eina_list_free(list);
         list = NULL;
@@ -304,7 +304,7 @@ void _e_desk_area_disable(E_Desk_Area *eda)
         EINA_LIST_REVERSE_FOREACH(list, l, ec)
           {
              // unset ec's desk_area enable flag
-             e_client_desk_area_enable_set(ec, EINA_FALSE);
+             e_desk_area_ec_enable_set(eda, ec, EINA_FALSE);
              // restore original ec->layer
              e_client_desk_area_original_layer_restore(ec);
              // restore ec's original geometry (changing real geometry or using transform)
@@ -1099,3 +1099,34 @@ e_desk_area_ec_reassign(E_Desk_Area *eda, E_Client *ec)
 
    return EINA_TRUE;
 }
+
+EINTERN Eina_Bool
+e_desk_area_ec_enable_set(E_Desk_Area *eda, E_Client *ec, Eina_Bool enable)
+{
+   if (!eda) return EINA_FALSE;
+   if (!ec) return EINA_FALSE;
+
+   ec->desk_area.enable = enable;
+
+   ELOGF("EDG", "Desk group enable set to %d", ec, enable);
+   if (enable)
+     {
+        if (!ec->desk_area.transform)
+          {
+             ec->desk_area.transform = e_util_transform_new();
+             e_util_transform_role_set(ec->desk_area.transform, "desk_area");
+          }
+     }
+   else
+     {
+        if (ec->desk_area.transform)
+          {
+             e_util_transform_del(ec->desk_area.transform);
+             ec->desk_area.transform = NULL;
+          }
+     }
+
+   e_desk_area_ec_update(ec->desk_area.desk_area, ec);
+
+   return EINA_TRUE;
+}

diff --git a/src/bin/e_desk_area.h b/src/bin/e_desk_area.h
index 90ea4d7..f735005 100644 (file)
--- a/src/bin/e_desk_area.h
+++ b/src/bin/e_desk_area.h
@@ -106,6 +106,7 @@ E_API E_Desk_Area_Hook *e_desk_area_hook_add(E_Desk_Area_Hook_Point hookpoint, E
 E_API void               e_desk_area_hook_del(E_Desk_Area_Hook *dgh);
 
 E_API Eina_Bool       e_desk_area_ec_reassign(E_Desk_Area *eda, E_Client *ec);
+EINTERN Eina_Bool     e_desk_area_ec_enable_set(E_Desk_Area *eda, E_Client *ec, Eina_Bool enable);
 
 extern E_API int E_EVENT_DESK_AREA_CHANGE;