e_view_client: remove e_view_client_xy_unadjust

e_view_client_xy_unadjust and e_comp_object_xy_unadjust are useless.

Change-Id: I7f113a627e767ee45027034c5e94b771ae3b5d6b

diff --git a/src/bin/compmgr/e_comp_object.c b/src/bin/compmgr/e_comp_object.c
index 87b842b9e02ad08e79d8f86d82f5fdab3a27d03a..cf21c6861d48ae64c91c1da91c6cea6b0dc1eb41 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_unadjust(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_wh_adjust(Evas_Object *obj, int w, int h, int *aw, int *ah)
 {

diff --git a/src/bin/core/e_view_client.c b/src/bin/core/e_view_client.c
index fbd84aebe86d7a9de7a4c4dc4f8c3cb8410592ce..4cbcd813588acc6e1a6b5e186271bf1e09fbe20c 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_unadjust(E_View_Client *client, int x, int y, int *ax, int *ay)
-{
-   if (client == NULL) return;
-
-   e_comp_object_frame_xy_unadjust(client->view.eo, x, y, ax, ay);
-}
-
 E_API void
 e_view_client_frame_wh_adjust(E_View_Client *client, int width, int height, int *aw, int *ah)
 {

diff --git a/src/bin/displaymgr/video/e_video_hwc.c b/src/bin/displaymgr/video/e_video_hwc.c
index 3c561644f29cbb9f8aa200e8f9a2eaf8aad33bbe..a296bc27b269df8bb53d2383a3abd55bddaff187 100644 (file)
--- a/src/bin/displaymgr/video/e_video_hwc.c
+++ b/src/bin/displaymgr/video/e_video_hwc.c
@@ -1676,7 +1676,6 @@ _e_video_hwc_geometry_output_rect_get(E_Client *ec, Eina_Rectangle *out)
    out->w = (out->w + 1) & ~1;
    out->h = ec->comp_data->height_from_viewport;
 
-   e_view_client_frame_xy_unadjust(e_client_view_get(ec), out->x, out->y, &out->x, &out->y);
    e_view_client_frame_wh_unadjust(e_client_view_get(ec), out->w, out->h, &out->w, &out->h);
 }
 

diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c
index 8d242b75577c8d655cb344d5a21d6380f37eb810..721134a06b630457c35d98c7e7dcb5995430491e 100644 (file)
--- a/src/bin/server/e_comp_wl.c
+++ b/src/bin/server/e_comp_wl.c
@@ -2953,9 +2953,8 @@ _e_comp_wl_client_position_update(E_Client *ec)
    /* update the position */
    if (ec->changes.pos)
      {
-        e_view_client_frame_xy_unadjust(e_client_view_get(ec),
-                                        ec->x, ec->y,
-                                        &x, &y);
+        x = ec->x;
+        y = ec->y;
      }
    else
      {
@@ -5899,7 +5898,6 @@ _e_comp_wl_surface_output_viewport_get(E_Client *ec, Eina_Rectangle *out)
    out->w = (out->w + 1) & ~1;
    out->h = ec->comp_data->height_from_viewport;
 
-   e_view_client_frame_xy_unadjust(e_client_view_get(ec), out->x, out->y, &out->x, &out->y);
    e_view_client_frame_wh_unadjust(e_client_view_get(ec), out->w, out->h, &out->w, &out->h);
 }
 

diff --git a/src/bin/server/e_comp_wl_shell.c b/src/bin/server/e_comp_wl_shell.c
index 3957af7bb221f4f16809b3b251e68c84cc6538f6..d03a2845e6f5ded06aed546bbfff5b5e56a353ab 100644 (file)
--- a/src/bin/server/e_comp_wl_shell.c
+++ b/src/bin/server/e_comp_wl_shell.c
@@ -317,11 +317,8 @@ e_shell_e_client_interactive_move(E_Client *ec,
       default:          ev.button = comp_wl->ptr.button; break;
      }
 
-   e_view_client_frame_xy_unadjust(e_client_view_get(ec),
-                                   wl_fixed_to_int(comp_wl->ptr.x),
-                                   wl_fixed_to_int(comp_wl->ptr.y),
-                                   &ev.canvas.x,
-                                   &ev.canvas.y);
+   ev.canvas.x = wl_fixed_to_int(comp_wl->ptr.x);
+   ev.canvas.y = wl_fixed_to_int(comp_wl->ptr.y);
 
    _e_shell_e_client_mouse_down_helper(ec, &ev, EINA_TRUE, 0);
 
@@ -370,11 +367,8 @@ e_shell_e_client_interactive_resize(E_Client *ec,
       default:         ev.button = comp_wl->ptr.button; break;
      }
 
-   e_view_client_frame_xy_unadjust(e_client_view_get(ec),
-                                   wl_fixed_to_int(comp_wl->ptr.x),
-                                   wl_fixed_to_int(comp_wl->ptr.y),
-                                   &ev.canvas.x,
-                                   &ev.canvas.y);
+   ev.canvas.x = wl_fixed_to_int(comp_wl->ptr.x);
+   ev.canvas.y = wl_fixed_to_int(comp_wl->ptr.y);
 
    _e_shell_e_client_mouse_down_helper(ec, &ev, EINA_FALSE, edges);
 

diff --git a/src/include/e_comp_object.h b/src/include/e_comp_object.h
index d6eb80fdea41483ac976fdf7e02031bd7a7b3166..50990f039405864fee93a32be897b4a3392c795f 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_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 c674d2e3d7aba61368cedbc1bc18670ebd2c4538..fe8056f4e45a7d3f33b7b054ebcb30ea3f477218 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_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);