e_view_client: remove e_view_client_xy_adjust

e_view_client_xy_adjust and e_comp_object_xy_adjust are useless.

Change-Id: Ib7c1d80cf68231a2e4d5da274504214e56fdd606

diff --git a/src/bin/compmgr/e_comp_object.c b/src/bin/compmgr/e_comp_object.c
index 19949cdd0d764a4e9adea137a6d46a0d2ce74003..87b842b9e02ad08e79d8f86d82f5fdab3a27d03a 100644 (file)
--- a/src/bin/compmgr/e_comp_object.c
+++ b/src/bin/compmgr/e_comp_object.c
@@ -2762,16 +2762,6 @@ e_comp_object_client_add(E_Client *ec)
 }
 
 /* utility functions for getting client inset */
-E_API void
-e_comp_object_frame_xy_adjust(Evas_Object *obj, int x, int y, int *ax, int *ay)
-{
-   API_ENTRY;
-
-   // TODO: this function will be removed
-   if (ax) *ax = x;
-   if (ay) *ay = y;
-}
-
 E_API void
 e_comp_object_frame_xy_unadjust(Evas_Object *obj, int x, int y, int *ax, int *ay)
 {

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index 2ed37a1e25b7244a2e3a92fd97f64434b3136c7b..5183604f517022445a4b7bc972b796be09a1e46d 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -6069,7 +6069,6 @@ E_API void
 e_client_util_move_without_frame(E_Client *ec, int x, int y)
 {
    if (!ec) return;
-   e_view_client_frame_xy_adjust(e_client_view_get(ec), x, y, &x, &y);
    e_view_position_set(e_view_client_view_get(e_client_view_get(ec)), x, y);
 }
 
@@ -6102,7 +6101,6 @@ e_client_util_move_resize_without_frame(E_Client *ec, int x, int y, int w, int h
                   ec->move_after_resize = EINA_TRUE;
                }
 
-             e_comp_object_frame_xy_adjust(ec->frame, x, y, &x, &y);
              e_client_pos_set(ec, x, y);
              e_client_util_resize_without_frame(ec, w, h);
           }

diff --git a/src/bin/core/e_view_client.c b/src/bin/core/e_view_client.c
index de6e872e73959525b56f190fd6c21ea492815876..fbd84aebe86d7a9de7a4c4dc4f8c3cb8410592ce 100644 (file)
--- a/src/bin/core/e_view_client.c
+++ b/src/bin/core/e_view_client.c
@@ -787,14 +787,6 @@ e_view_client_mask_has(E_View_Client *client)
    return e_comp_object_mask_has(client->view.eo);
 }
 
-E_API void
-e_view_client_frame_xy_adjust(E_View_Client *client, int x, int y, int *ax, int *ay)
-{
-   if (client == NULL) return;
-
-   e_comp_object_frame_xy_adjust(client->view.eo, x, y, ax, ay);
-}
-
 E_API void
 e_view_client_frame_xy_unadjust(E_View_Client *client, int x, int y, int *ax, int *ay)
 {

diff --git a/src/bin/windowmgr/e_policy_zone.c b/src/bin/windowmgr/e_policy_zone.c
index 5aeccb9c25dd445a7c7c5dcbc8817f18be3d9a91..b50bb412f58dbc2fdffe8e099a0bcf82226870cf 100644 (file)
--- a/src/bin/windowmgr/e_policy_zone.c
+++ b/src/bin/windowmgr/e_policy_zone.c
@@ -860,8 +860,6 @@ _policy_zone_cb_client_eval_post_new_client(struct wl_listener *listener, void *
    if (ec->re_manage)
      {
         int x = ec->x, y = ec->y;
-        if (ec->x) e_view_client_frame_xy_adjust(e_client_view_get(ec), ec->x, 0, &ec->x, NULL);
-        if (ec->y) e_view_client_frame_xy_adjust(e_client_view_get(ec), 0, ec->y, NULL, &ec->y);
         if ((x != ec->x) || (y != ec->y)) ec->changes.pos = 1;
         ec->placed = 1;
         ec->pre_cb.x = ec->x; ec->pre_cb.y = ec->y;

diff --git a/src/include/e_comp_object.h b/src/include/e_comp_object.h
index c03dfe61f17897139fab1c089b0de6c15c9d8959..d6eb80fdea41483ac976fdf7e02031bd7a7b3166 100644 (file)
--- a/src/include/e_comp_object.h
+++ b/src/include/e_comp_object.h
@@ -95,7 +95,6 @@ E_API Eina_Bool e_comp_object_mask_has(Evas_Object *obj);
 
 E_API Evas_Object *e_comp_object_util_mirror_add(Evas_Object *obj);
 
-E_API void e_comp_object_frame_xy_adjust(Evas_Object *obj, int x, int y, int *ax, int *ay);
 E_API void e_comp_object_frame_xy_unadjust(Evas_Object *obj, int x, int y, int *ax, int *ay);
 E_API void e_comp_object_frame_wh_adjust(Evas_Object *obj, int w, int h, int *aw, int *ah);
 E_API void e_comp_object_frame_wh_unadjust(Evas_Object *obj, int w, int h, int *aw, int *ah);

diff --git a/src/include/e_view_client.h b/src/include/e_view_client.h
index c4458516d372bbba5e1cd7195509786bdb361d96..c674d2e3d7aba61368cedbc1bc18670ebd2c4538 100644 (file)
--- a/src/include/e_view_client.h
+++ b/src/include/e_view_client.h
@@ -48,7 +48,6 @@ void e_view_client_transform_transp_set(E_View_Client *client, bool set);
 void e_view_client_mask_set(E_View_Client *client, bool set);
 bool e_view_client_mask_has(E_View_Client *client);
 
-void e_view_client_frame_xy_adjust(E_View_Client *client, int x, int y, int *ax, int *ay);
 void e_view_client_frame_xy_unadjust(E_View_Client *client, int x, int y, int *ax, int *ay);
 void e_view_client_frame_wh_adjust(E_View_Client *client, int width, int height, int *aw, int *ah);
 void e_view_client_frame_wh_unadjust(E_View_Client *client, int width, int height, int *aw, int *ah);