e_view_client: Remove e_view_client_layer_set function

Change-Id: Ia4c430f76e5d1cfcd3cfe14b7dcc0028af65addd

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index df3e9642ed36a9b9c0ce14b55095a323019c7786..265c23543e3e26a6d72f0adc5361b374292c4171 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -5516,6 +5516,9 @@ E_API Eina_Bool
 e_client_layer_set(E_Client *ec,
                    E_Layer layer)
 {
+   E_View *ec_view;
+   E_View_Tree *layer_tree;
+
    E_OBJECT_CHECK_RETURN(ec, EINA_FALSE);
    E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, EINA_FALSE);
    if (!ec->frame) return EINA_FALSE;
@@ -5523,11 +5526,16 @@ e_client_layer_set(E_Client *ec,
    if (e_util_client_layer_map(layer) == 9999)
      return EINA_FALSE; //invalid layer is not allowed
 
+   ec_view = e_view_client_view_get(e_client_view_get(ec));
+
    if (ec->layer != layer)
      {
-        e_view_position_set(e_view_client_view_get(e_client_view_get(ec)), ec->x, ec->y);
+        e_view_position_set(ec_view, ec->x, ec->y);
      }
-   e_view_client_layer_set(PRI(ec)->view_client, e_canvas_util_e_layer_map(layer));
+
+   layer_tree = e_canvas_layer_view_tree_get(e_canvas_get(ec_view), e_canvas_util_e_layer_map(layer));
+   e_view_reparent(ec_view, layer_tree);
+   evas_object_layer_set(ec_view->eo, layer);
    if (ec->layer != layer)
      {
         /* check exceptional case */

diff --git a/src/bin/core/e_view_client.c b/src/bin/core/e_view_client.c
index ffa3cf00faab96ec8f2cf3e1aff9b13e17e16060..bcf5301cfb8013bc9dc10205563551bc5726d17e 100644 (file)
--- a/src/bin/core/e_view_client.c
+++ b/src/bin/core/e_view_client.c
@@ -1144,18 +1144,6 @@ e_view_client_size_update(E_View_Client *client, int w, int h)
    e_comp_object_size_update(client->view.eo, w, h);
 }
 
-EINTERN void
-e_view_client_layer_set(E_View_Client *client, E_Canvas_Layer layer)
-{
-   if (client == NULL) return;
-
-   E_View_Tree *layer_tree;
-
-   layer_tree = e_canvas_layer_view_tree_get(e_canvas_get(&client->view), layer);
-   e_view_reparent(&client->view, layer_tree);
-   evas_object_layer_set(client->view.eo, e_canvas_util_layer_map(layer));
-}
-
 E_API void
 e_view_client_show(E_View_Client *client)
 {

diff --git a/src/bin/core/e_view_client_intern.h b/src/bin/core/e_view_client_intern.h
index e9d987f51877a5ca55d05916ffe2e4b89827de9d..b00870c25d4d7fb518ad7fd12e75dd330f743582 100644 (file)
--- a/src/bin/core/e_view_client_intern.h
+++ b/src/bin/core/e_view_client_intern.h
@@ -69,12 +69,10 @@ void e_view_client_color_visible_set_listener_add(E_View_Client *client, struct
 void e_view_client_input_objs_del(E_View_Client *client);
 void e_view_client_clear(E_View_Client *client);
 void e_view_client_size_update(E_View_Client *client, int w, int h);
-void e_view_client_layer_set(E_View_Client *client, E_Canvas_Layer layer);
 void e_view_client_show(E_View_Client *client);
 void e_view_client_hide(E_View_Client *client);
 void e_view_client_native_surface_set(E_View_Client *client, bool set);
 void e_view_client_input_rect_get(E_View_Client *client, Eina_List **list);
-void e_view_client_layer_set(E_View_Client *client, E_Canvas_Layer layer);
 bool e_view_client_is_input_acceptable(E_View_Client *client, int x, int y);
 
 #ifdef  __cplusplus