e_zone: remove unused zone->base and zone->over

Change-Id: I959125935dce5ec850010e7e867abd73f0548852

diff --git a/src/bin/compmgr/e_comp_canvas.c b/src/bin/compmgr/e_comp_canvas.c
index 3721c422beb263e54ab20f6651f58f28ac25c56c..8d0d52e67afc2e9dea0c1e187dffc54b01a19475 100644 (file)
--- a/src/bin/compmgr/e_comp_canvas.c
+++ b/src/bin/compmgr/e_comp_canvas.c
@@ -434,35 +434,6 @@ e_comp_zone_id_get(int id)
    return NULL;
 }
 
-EINTERN void
-e_comp_canvas_zone_update(E_Zone *zone)
-{
-   E_View_Tree *layer_tree;
-   E_View_Rect *rect;
-   E_View *view;
-   int color[4] = {0, 0, 0, 255};
-
-   E_FREE_FUNC(zone->base, e_view_destroy);
-   E_FREE_FUNC(zone->over, e_view_destroy);
-
-   layer_tree = e_canvas_layer_view_tree_get(e_comp_canvas_get(), E_CANVAS_LAYER_BG);
-   rect = e_view_rect_create(layer_tree, zone->w, zone->w, color);
-   zone->base = view = e_view_rect_view_get(rect);
-   e_view_repeat_events_set(view, true);
-   e_view_name_set(view, "zone->base");
-   e_view_position_set(view, zone->x, zone->y);
-   e_view_show(view);
-
-   layer_tree = e_canvas_layer_view_tree_get(e_comp_canvas_get(), E_CANVAS_LAYER_MAX);
-   rect = e_view_rect_create(layer_tree, zone->w, zone->w, color);
-   zone->over = view = e_view_rect_view_get(rect);
-   e_view_name_set(view, "zone->over");
-   e_view_pass_events_set(view, true);
-   e_view_position_set(view, zone->x, zone->y);
-   e_view_raise_to_top(view);
-   e_view_show(view);
-}
-
 EINTERN void
 e_comp_canvas_fps_toggle(void)
 {

diff --git a/src/bin/compmgr/e_comp_canvas_intern.h b/src/bin/compmgr/e_comp_canvas_intern.h
index 61ae3a9b8bbd476f7cb5ac96b4b3447fd6bb97ff..362fc5e8f0305f578e5c80f59cc505f2be8298f7 100644 (file)
--- a/src/bin/compmgr/e_comp_canvas_intern.h
+++ b/src/bin/compmgr/e_comp_canvas_intern.h
@@ -10,7 +10,6 @@ EINTERN void       e_comp_all_freeze(void);
 EINTERN void       e_comp_all_thaw(void);
 EINTERN E_Zone    *e_comp_zone_number_get(int num);
 EINTERN E_Zone    *e_comp_zone_id_get(int id);
-EINTERN void       e_comp_canvas_zone_update(E_Zone *zone);
 EINTERN void       e_comp_canvas_fps_toggle(void);
 EINTERN E_Layer    e_comp_canvas_client_layer_map_nearest(int layer);
 EINTERN void       e_comp_canvas_keys_grab(void);

diff --git a/src/bin/core/e_zone.c b/src/bin/core/e_zone.c
index 8e49378e24550eba5a28c8bca82ed59aa22ba710..f223f4f13d65522d8b14238291c8d325551150b4 100644 (file)
--- a/src/bin/core/e_zone.c
+++ b/src/bin/core/e_zone.c
@@ -649,9 +649,6 @@ _e_zone_free(E_Zone *zone)
    e_view_destroy(e_view_rect_view_get(bg_event_view_rect));
    e_view_destroy(e_view_rect_view_get(bg_clip_view_rect));
 
-   e_view_destroy(zone->base);
-   e_view_destroy(zone->over);
-
    _e_zone_private_finish(zone);
    free(zone);
 }

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index a03351b303eaa8d6d03e87772583b3fe579db333..46f16b968a6c9a3f6cced72efd3ac5f750451b2f 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -663,13 +663,6 @@ _e_comp_screen_screen_policy_update(void)
 
    if (!changed) return;
 
-   EINA_LIST_FOREACH(comp->zones, l, zone)
-     {
-        E_FREE_FUNC(zone->base, evas_object_del);
-        E_FREE_FUNC(zone->over, evas_object_del);
-        e_comp_canvas_zone_update(zone);
-     }
-
    // TODO: update all zones -> desks -> desk_areas -> ecs
 #endif
 }

diff --git a/src/include/e_zone.h b/src/include/e_zone.h
index a2f66e7d9347ad1c5e03c111582b506c3eb83912..b5c796c42461124ffe44e2f9561f055e39f469f5 100644 (file)
--- a/src/include/e_zone.h
+++ b/src/include/e_zone.h
@@ -69,8 +69,8 @@ struct _E_Zone
    Eina_List   *handlers;
 
    /* formerly E_Comp_Zone */
-   E_View *base;
-   E_View *over;
+   E_DEPRECATED E_View *base;
+   E_DEPRECATED E_View *over;
    //double       bl;    // backlight level
    //Eina_Bool    bloff; // backlight is off
 
@@ -149,7 +149,7 @@ E_API E_Zone    *e_zone_current_get(void);
 E_API int        e_zone_id_get(E_Zone *zone);
 E_API int        e_zone_number_get(E_Zone *zone);
 E_API char      *e_zone_output_id_get(E_Zone *zone);
-E_API E_View    *e_zone_over_get(E_Zone *zone);
+E_DEPRECATED E_API E_View    *e_zone_over_get(E_Zone *zone);
 E_API void       e_zone_useful_geometry_get(E_Zone *zone, int *x, int *y, int *w, int *h);
 E_API E_Desk    *e_zone_desk_find_by_ec(E_Zone *zone, E_Client *ec);