e_view_client: remove e_view_client_wh_unadjust

e_view_client_wh_unadjust and e_comp_object_wh_unadjust are useless.

Change-Id: I78b3f63c3372e0de2ea46fd48eff744c6b91a671

diff --git a/src/bin/compmgr/e_comp_object.c b/src/bin/compmgr/e_comp_object.c
index c69b2f3bec34e57928e16c42df2dd79182fcf126..aa85c07bb414e53682157c7ef4b10f09a25b8be0 100644 (file)
--- a/src/bin/compmgr/e_comp_object.c
+++ b/src/bin/compmgr/e_comp_object.c
@@ -2757,17 +2757,6 @@ e_comp_object_client_add(E_Client *ec)
    return o;
 }
 
-/* utility functions for getting client inset */
-E_API void
-e_comp_object_frame_wh_unadjust(Evas_Object *obj, int w, int h, int *aw, int *ah)
-{
-   API_ENTRY;
-
-   // TODO: this function will be removed
-   if (aw) *aw = w;
-   if (ah) *ah = h;
-}
-
 E_API E_Client *
 e_comp_object_client_get(Evas_Object *obj)
 {

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index c849bbb1e8b766c508abef70e18a658755d6e3df..f0e6b52bc34ab756f66eb75a2d168b6a1e9bfecd 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -5088,8 +5088,6 @@ e_client_resize_limit(E_Client *ec, int *w, int *h)
    E_OBJECT_CHECK(ec);
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
 
-   if (ec->frame)
-     e_comp_object_frame_wh_unadjust(ec->frame, *w, *h, w, h);
    if (*h < 1) *h = 1;
    if (*w < 1) *w = 1;
 

diff --git a/src/bin/core/e_view_client.c b/src/bin/core/e_view_client.c
index aa5b4c075f581f323931f2bd0c2a70a5e700ba8a..f3a073c4840ea789134c1467773c47f99174e0ae 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_wh_unadjust(E_View_Client *client, int width, int height, int *aw, int *ah)
-{
-   if (client == NULL) return;
-
-   e_comp_object_frame_wh_unadjust(client->view.eo, width, height, aw, ah);
-}
-
 EINTERN bool
 e_view_client_hwc_update_exists(E_View_Client *client)
 {

diff --git a/src/bin/displaymgr/video/e_video_hwc.c b/src/bin/displaymgr/video/e_video_hwc.c
index a296bc27b269df8bb53d2383a3abd55bddaff187..36fd96780349dfc5566e2a14b9841ec11df506f1 100644 (file)
--- a/src/bin/displaymgr/video/e_video_hwc.c
+++ b/src/bin/displaymgr/video/e_video_hwc.c
@@ -1675,8 +1675,6 @@ _e_video_hwc_geometry_output_rect_get(E_Client *ec, Eina_Rectangle *out)
    out->w = ec->comp_data->width_from_viewport;
    out->w = (out->w + 1) & ~1;
    out->h = ec->comp_data->height_from_viewport;
-
-   e_view_client_frame_wh_unadjust(e_client_view_get(ec), out->w, out->h, &out->w, &out->h);
 }
 
 /* convert from logical screen to physical output */

diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c
index 3a7934365bb3a0d32938d57449cb49ba39f6b692..a9edccfd920a1bb4554d268b3022e385e00e9f1f 100644 (file)
--- a/src/bin/server/e_comp_wl.c
+++ b/src/bin/server/e_comp_wl.c
@@ -5894,8 +5894,6 @@ _e_comp_wl_surface_output_viewport_get(E_Client *ec, Eina_Rectangle *out)
    out->w = ec->comp_data->width_from_viewport;
    out->w = (out->w + 1) & ~1;
    out->h = ec->comp_data->height_from_viewport;
-
-   e_view_client_frame_wh_unadjust(e_client_view_get(ec), out->w, out->h, &out->w, &out->h);
 }
 
 EINTERN Eina_Bool

diff --git a/src/bin/windowmgr/e_policy_desk_area.c b/src/bin/windowmgr/e_policy_desk_area.c
index fd301e581d5592357ca384286f4c12acf4f7432d..a8e5e3c55bb0a5f4656792306cdbe45dd06fa3da 100644 (file)
--- a/src/bin/windowmgr/e_policy_desk_area.c
+++ b/src/bin/windowmgr/e_policy_desk_area.c
@@ -1471,7 +1471,7 @@ _desk_area_cb_client_redirect(struct wl_listener *listener, void *data)
    E_Policy_Desk_Area_Private_Client *eda_client;
    E_Desk_Area *eda;
    E_Client *ec;
-   int w, h, pw, ph;
+   int w, h;
 
    eda_client = wl_container_of(listener, eda_client, redirect);
    eda = eda_client->eda;
@@ -1485,7 +1485,6 @@ _desk_area_cb_client_redirect(struct wl_listener *listener, void *data)
     */
 
    w = ec->w, h = ec->h;
-   e_view_client_frame_wh_unadjust(e_client_view_get(ec), w, h, &pw, &ph);
 
    e_view_client_frame_recalc(e_client_view_get(ec));
 
@@ -1502,7 +1501,7 @@ _desk_area_cb_client_redirect(struct wl_listener *listener, void *data)
    else if (ec->new_client)
      {
         if ((ec->w < 1) || (ec->h < 1)) return;
-        e_view_client_size_set(e_client_view_get(ec), pw, ph);
+        e_view_client_size_set(e_client_view_get(ec), w, h);
      }
    else if ((w != ec->w) || (h != ec->h))
      e_view_client_size_set(e_client_view_get(ec), w, h);
@@ -2408,8 +2407,6 @@ _desk_area_cb_comp_object_resize(struct wl_listener *listener, void *data)
 
         w = ec->mouse.last_down[ec->moveinfo.down.button - 1].w;
         h = ec->mouse.last_down[ec->moveinfo.down.button - 1].h;
-        if (e_view_client_frame_exists(e_client_view_get(ec)))
-          e_view_client_frame_wh_unadjust(e_client_view_get(ec), w, h, &w, &h);
 
         switch (ec->resize_mode)
           {

diff --git a/src/include/e_comp_object.h b/src/include/e_comp_object.h
index 774de9d201b887776e60c612afb1899b839e6098..f719cee1a870511ba4769304269ce77f204056bb 100644 (file)
--- a/src/include/e_comp_object.h
+++ b/src/include/e_comp_object.h
@@ -95,8 +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_wh_unadjust(Evas_Object *obj, int w, int h, int *aw, int *ah);
-
 E_API void e_comp_object_signal_emit(Evas_Object *obj, const char *sig, const char *src);
 E_API void e_comp_object_signal_callback_add(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data);
 E_API void e_comp_object_signal_callback_del(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb);

diff --git a/src/include/e_view_client.h b/src/include/e_view_client.h
index f8a705ce6f34b8c93e30c79aabd99dd6f671960f..7f0fb1a9654d1274699fa11c45cd02fcd7fa019d 100644 (file)
--- a/src/include/e_view_client.h
+++ b/src/include/e_view_client.h
@@ -48,8 +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_wh_unadjust(E_View_Client *client, int width, int height, int *aw, int *ah);
-
 void e_view_client_signal_emit(E_View_Client *client, const char *sig, const char *src);
 void e_view_client_input_area_set(E_View_Client *client, int x, int y, int w, int h);
 void e_view_client_input_rect_get(E_View_Client *client, Eina_List **list);