e_policy_layer: Remove dependency on e_policy_desk_area from e_policy_layer

Change-Id: Ie1727baba18095c87c3ac87bdc3f1465c9e3c2f4

diff --git a/src/bin/windowmgr/e_policy_layer.c b/src/bin/windowmgr/e_policy_layer.c
index 29f4251c36dd61c4714cc9adcaea884e95f8768c..fbf7ffd110193d6a35273081a19c8a2d1a5e1611 100644 (file)
--- a/src/bin/windowmgr/e_policy_layer.c
+++ b/src/bin/windowmgr/e_policy_layer.c
@@ -1,7 +1,5 @@
 #include "e_policy_layer_intern.h"
 
-#include "e_desk_area_intern.h"
-#include "e_policy_desk_area_intern.h"
 #include "e_policy_container_intern.h"
 #include "e_view_intern.h"
 #include "e_view_rect.h"
@@ -14,7 +12,7 @@ struct _E_Policy_Layer
 {
    E_Policy_Container container;
 
-   E_Policy_Desk_Area *pda;
+   E_Policy_Container *parent_container;
    E_Layer layer;
    E_View *layer_bottom;
 };
@@ -91,10 +89,9 @@ e_policy_layer_obj_get(E_Policy_Layer *pdal)
 }
 
 EINTERN E_Policy_Layer *
-e_policy_layer_new(E_Policy_Desk_Area *pda, E_Layer layer)
+e_policy_layer_new(E_Policy_Container *parent_container, E_Layer layer)
 {
     E_Policy_Layer * pdal = NULL;
-    E_Desk_Area *eda;
     E_View_Rect *layer_bottom_rect;
     int color[4] = {0, 0, 0, 255};
 #ifdef NEED_LAYER_RENAME
@@ -102,30 +99,24 @@ e_policy_layer_new(E_Policy_Desk_Area *pda, E_Layer layer)
     char layer_name[20] = "layer_obj_";
 #endif
 
-    EINA_SAFETY_ON_NULL_GOTO(pda, err);
-
-    eda = e_policy_desk_area_get_desk_area(pda);
-    EINA_SAFETY_ON_NULL_GOTO(eda, err);
-
     pdal = E_NEW(E_Policy_Layer, 1);
     EINA_SAFETY_ON_NULL_GOTO(pdal, err);
 
-    ELOGF("POL_LAYER", "Create policy_layer, desk_area(ID:%d):%p, policy_desk_area:%p, policy_layer:%p, layer:%d",
-          NULL, eda->id, eda, pda, pdal, layer);
+    ELOGF("POL_LAYER", "Create policy_layer, parent policy container:%p, policy_layer:%p, layer:%d", NULL, parent_container, pdal, layer);
 
-   if (!e_policy_container_view_tree_init(e_policy_container_get(pdal), &desk_area_layer_tree_impl, e_policy_container_general_get(pda)))
+   if (!e_policy_container_view_tree_init(e_policy_container_get(pdal), &desk_area_layer_tree_impl, parent_container))
      {
         ERR("Failed to init view tree of desk area layer:%p / layer:%d", pdal, layer);
         goto err;
      }
-    layer_bottom_rect = e_view_rect_create(&e_policy_container_get(pdal)->tree, eda->w, eda->h, color);
+    layer_bottom_rect = e_view_rect_create(&e_policy_container_get(pdal)->tree, 1, 1, color);
     if (!layer_bottom_rect)
       {
          ERR("Failed to init view tree of desk area layer:%p / layer:%d", pdal, layer);
          goto err;
       }
 
-    pdal->pda = pda;
+    pdal->parent_container = parent_container;
     pdal->layer = layer;
     pdal->layer_bottom = e_view_rect_view_get(layer_bottom_rect);
 

diff --git a/src/bin/windowmgr/e_policy_layer_intern.h b/src/bin/windowmgr/e_policy_layer_intern.h
index ce2fb54d09d82f1562f01353d2764d6c158f2bf0..61ff02db713bee6982fdf804c04a8d159085849c 100644 (file)
--- a/src/bin/windowmgr/e_policy_layer_intern.h
+++ b/src/bin/windowmgr/e_policy_layer_intern.h
@@ -2,7 +2,7 @@
 #define E_POLICY_LAYER_INTERN_H
 
 #include "e_intern.h"
-#include "e_policy_desk_area_intern.h"
+#include "e_policy_container_intern.h"
 #include "e_view_intern.h"
 
 typedef struct _E_Policy_Layer E_Policy_Layer;
@@ -13,7 +13,7 @@ EINTERN Eina_Bool                 e_policy_layer_has_ec(E_Policy_Layer *pdal, E_
 EINTERN E_View_Tree              *e_policy_layer_view_tree_get(E_Policy_Layer *pdal);
 EINTERN E_View                   *e_policy_layer_obj_get(E_Policy_Layer *pdal);
 
-EINTERN E_Policy_Layer           *e_policy_layer_new(E_Policy_Desk_Area *pda, E_Layer layer);
+EINTERN E_Policy_Layer           *e_policy_layer_new(E_Policy_Container *parent_container, E_Layer layer);
 EINTERN void                      e_policy_layer_del(E_Policy_Layer *pdal);
 
 #endif //E_POLICY_LAYER_INTERN_H