From b8ba02f2c70fad18099ca8868592a9ccd6040619 Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Tue, 30 Jun 2020 12:46:37 +0900 Subject: [PATCH] e_client: change parameters for transform_update_with_desk_zoom From e_client_transform_core_update_with_desk_zoom(E_Client *ec) To e_client_transform_core_update_with_desk_zoom(E_Client *ec, double zoomx, double zoomy, Evas_Coord cx, Evas_Coord cy) Change-Id: I513d646c1c045377c0e24b725a51a24aa11199a6 --- src/bin/e_client.c | 12 +----------- src/bin/e_client.h | 2 +- src/bin/e_desk.c | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 38f27ed..95f182a 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -7375,23 +7375,13 @@ _e_client_transform_core_update_with_zoom(E_Client *ec, double zoomx, double zoo } EINTERN void -e_client_transform_core_update_with_desk_zoom(E_Client *ec) +e_client_transform_core_update_with_desk_zoom(E_Client *ec, double zoomx, double zoomy, Evas_Coord cx, Evas_Coord cy) { - E_Desk *desk; - double zoomx, zoomy; - Evas_Coord cx, cy; - Eina_Bool ret; Eina_Bool enable; if (!ec) return; if (ec->new_client) return; - desk = ec->desk; - if (!desk) return; - - ret = e_desk_zoom_get(desk, &zoomx, &zoomy, &cx, &cy); - if (!ret) return; - enable = e_client_transform_core_enable_get(ec); if (enable) _e_client_transform_core_update_with_zoom(ec, zoomx, zoomy, cx, cy); diff --git a/src/bin/e_client.h b/src/bin/e_client.h index d627a01..c683a04 100644 --- a/src/bin/e_client.h +++ b/src/bin/e_client.h @@ -1178,7 +1178,7 @@ E_API E_Util_Transform *e_client_transform_core_transform_get(E_Client *ec, int E_API void e_client_transform_core_input_transform(E_Client *ec, int x, int y, int *out_x, int *out_y); E_API void e_client_transform_core_input_inv_transform(E_Client *ec, int x, int y, int *out_x, int *out_y); E_API void e_client_transform_core_input_inv_rect_transform(E_Client *ec, int x, int y, int *out_x, int *out_y); -EINTERN void e_client_transform_core_update_with_desk_zoom(E_Client *ec); +EINTERN void e_client_transform_core_update_with_desk_zoom(E_Client *ec, double zoomx, double zoomy, Evas_Coord cx, Evas_Coord cy); E_API E_Pixmap *e_client_pixmap_change(E_Client *ec, E_Pixmap *newcp); E_API void e_client_window_role_set(E_Client *ec, const char *role); diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c index c4363b3..c2c0dd2 100644 --- a/src/bin/e_desk.c +++ b/src/bin/e_desk.c @@ -1588,7 +1588,7 @@ _e_desk_client_zoom(E_Client *ec, double zoomx, double zoomy, Evas_Coord cx, Eva transformed = e_client_transform_core_enable_get(ec); if (transformed) - e_client_transform_core_update_with_desk_zoom(ec); + e_client_transform_core_update_with_desk_zoom(ec, zoomx, zoomy, cx, cy); else _e_desk_object_zoom(ec->frame, zoomx, zoomy, cx, cy); -- 2.7.4