e_comp_canvas: create the view_rect instead of view_edje

The zone->over and zone->base is view_rects instead of view_edjes.

Change-Id: Ic4cbccd902247f4e2d354153b318d6b0134fd0bf

diff --git a/src/bin/compmgr/e_comp_canvas.c b/src/bin/compmgr/e_comp_canvas.c
index 2b17c21f87b2063c2fbd83adbf74ef9ba740973b..957afa9aad696d4dafadb50a1f19d6277a1a0ed8 100644 (file)
--- a/src/bin/compmgr/e_comp_canvas.c
+++ b/src/bin/compmgr/e_comp_canvas.c
@@ -442,48 +442,27 @@ EINTERN void
 e_comp_canvas_zone_update(E_Zone *zone)
 {
    E_View_Tree *layer_tree;
-   E_View_Edje *view_edje;
+   E_View_Rect *rect;
    E_View *view;
-   const char *const over_styles[] =
-   {
-      "e/comp/screen/overlay/default",
-      "e/comp/screen/overlay/noeffects"
-   };
-   const char *const under_styles[] =
-   {
-      "e/comp/screen/base/default",
-      "e/comp/screen/base/noeffects"
-   };
-   E_Comp_Config *conf = e_comp_config_get();
+   int color[4] = {0, 0, 0, 255};
 
-   if (zone->over && zone->base)
-     {
-        e_theme_edje_view_set(e_view_edje_from_view(zone->base), "base/theme/comp",
-                              under_styles[conf->disable_screen_effects]);
-        e_theme_edje_view_set(e_view_edje_from_view(zone->over), "base/theme/comp",
-                              over_styles[conf->disable_screen_effects]);
-        return;
-     }
    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);
-   view_edje = e_view_edje_create(layer_tree);
-   zone->base = view = e_view_edje_view_get(view_edje);
+   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_theme_edje_view_set(view_edje, "base/theme/comp", under_styles[conf->disable_screen_effects]);
    e_view_position_set(view, zone->x, zone->y);
-   e_view_edje_size_set(view_edje, zone->w, zone->h);
    e_view_show(view);
 
    layer_tree = e_canvas_layer_view_tree_get(e_comp_canvas_get(), E_CANVAS_LAYER_MAX);
-   view_edje = e_view_edje_create(layer_tree);
-   zone->over = view = e_view_edje_view_get(view_edje);
+   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_theme_edje_view_set(view_edje, "base/theme/comp", over_styles[conf->disable_screen_effects]);
    e_view_position_set(view, zone->x, zone->y);
-   e_view_edje_size_set(view_edje, zone->w, zone->h);
    e_view_raise_to_top(view);
    e_view_show(view);
 }