From: SooChan Lim Date: Fri, 31 Jan 2025 06:08:12 +0000 (+0900) Subject: e_view_client: remove e_view_client_wh_adjust X-Git-Tag: accepted/tizen/unified/20250203.113944~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72ff81cb59f0b27beb393ba800a692197d5a79d3;p=platform%2Fupstream%2Fenlightenment.git e_view_client: remove e_view_client_wh_adjust e_view_client_wh_adjust and e_comp_object_wh_adjust are useless. Change-Id: I9ab15d0a2f63fa79c2e6627c8fa7de667e16996f --- diff --git a/src/bin/compmgr/e_comp_object.c b/src/bin/compmgr/e_comp_object.c index cf21c6861d..c69b2f3bec 100644 --- a/src/bin/compmgr/e_comp_object.c +++ b/src/bin/compmgr/e_comp_object.c @@ -1403,13 +1403,9 @@ _e_comp_intercept_resize(void *data, Evas_Object *obj, int w, int h) if ((!cw->ec->input_only) && (!cw->ec->override) && (((w != pw) || (h != ph)))) { - //INF("CALLBACK: REQ(%dx%d) != CUR(%dx%d)", w - fw, h - fh, pw, ph); wl_signal_emit(&cw->events.resize, NULL); - /* flip for CSD */ - if (cw->ec->input_only) - e_comp_object_frame_wh_adjust(obj, pw, ph, &w, &h); - else - w = pw, h = ph; + + w = pw, h = ph; if ((cw->w == w) && (cw->h == h)) { /* going to be a noop resize which won't trigger smart resize */ @@ -2762,16 +2758,6 @@ e_comp_object_client_add(E_Client *ec) } /* utility functions for getting client inset */ -E_API void -e_comp_object_frame_wh_adjust(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 void e_comp_object_frame_wh_unadjust(Evas_Object *obj, int w, int h, int *aw, int *ah) { diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c index 5183604f51..c849bbb1e8 100644 --- a/src/bin/core/e_client.c +++ b/src/bin/core/e_client.c @@ -5099,9 +5099,6 @@ e_client_resize_limit(E_Client *ec, int *w, int *h) if ((ec->icccm.max_h > 0) && (*h > ec->icccm.max_h)) *h = ec->icccm.max_h; else if (*h < ec->icccm.min_h) *h = ec->icccm.min_h; - - if (ec->frame) - e_comp_object_frame_wh_adjust(ec->frame, *w, *h, w, h); } //////////////////////////////////////////// @@ -6076,7 +6073,7 @@ E_API void e_client_util_resize_without_frame(E_Client *ec, int w, int h) { if (!ec) return; - e_view_client_frame_wh_adjust(e_client_view_get(ec), w, h, &w, &h); + e_view_client_size_set(e_client_view_get(ec), w, h); e_client_stay_within_canvas_margin(ec); } diff --git a/src/bin/core/e_view_client.c b/src/bin/core/e_view_client.c index 4cbcd81358..aa5b4c075f 100644 --- 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_adjust(E_View_Client *client, int width, int height, int *aw, int *ah) -{ - if (client == NULL) return; - - e_comp_object_frame_wh_adjust(client->view.eo, width, height, aw, ah); -} - E_API void e_view_client_frame_wh_unadjust(E_View_Client *client, int width, int height, int *aw, int *ah) { diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c index 721134a06b..3a7934365b 100644 --- a/src/bin/server/e_comp_wl.c +++ b/src/bin/server/e_comp_wl.c @@ -2913,7 +2913,7 @@ _e_comp_wl_client_buffer_set(E_Client *ec, E_Comp_Wl_Buffer *buffer) static void _e_comp_wl_client_size_set(E_Client *ec, int width, int height) { - int w, h, nw, nh; + int w, h; w = ec->w; h = ec->h; @@ -2921,10 +2921,7 @@ _e_comp_wl_client_size_set(E_Client *ec, int width, int height) ec->client.w = width; ec->client.h = height; - e_view_client_frame_wh_adjust(e_client_view_get(ec), - ec->client.w, ec->client.h, - &nw, &nh); - e_client_size_set(ec, nw, nh); + e_client_size_set(ec, ec->client.w, ec->client.h); if ((w != ec->w) || (h != ec->h)) { diff --git a/src/bin/windowmgr/e_policy_desk_area.c b/src/bin/windowmgr/e_policy_desk_area.c index fa50cdbf69..fd301e581d 100644 --- a/src/bin/windowmgr/e_policy_desk_area.c +++ b/src/bin/windowmgr/e_policy_desk_area.c @@ -1490,7 +1490,10 @@ _desk_area_cb_client_redirect(struct wl_listener *listener, void *data) e_view_client_frame_recalc(e_client_view_get(ec)); if (!ec->fullscreen) - e_view_client_frame_wh_adjust(e_client_view_get(ec), ec->client.w, ec->client.h, &w, &h); + { + w = ec->client.w; + h = ec->client.h; + } if (ec->fullscreen) { @@ -1499,8 +1502,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_frame_wh_adjust(e_client_view_get(ec), pw, ph, &w, &h); - e_view_client_size_set(e_client_view_get(ec), w, h); + e_view_client_size_set(e_client_view_get(ec), pw, ph); } else if ((w != ec->w) || (h != ec->h)) e_view_client_size_set(e_client_view_get(ec), w, h); diff --git a/src/include/e_comp_object.h b/src/include/e_comp_object.h index 50990f0394..774de9d201 100644 --- 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_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); E_API void e_comp_object_signal_emit(Evas_Object *obj, const char *sig, const char *src); diff --git a/src/include/e_view_client.h b/src/include/e_view_client.h index fe8056f4e4..f8a705ce6f 100644 --- 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_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); void e_view_client_signal_emit(E_View_Client *client, const char *sig, const char *src);