From: SooChan Lim Date: Wed, 11 Nov 2020 03:09:22 +0000 (+0900) Subject: e_desk: use e_client_cdata_get X-Git-Tag: submit/tizen/20201117.045823~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c0afa403b6cf07e7fa42a4bea5ad93ac16b7018;p=platform%2Fupstream%2Fenlightenment.git e_desk: use e_client_cdata_get Change-Id: If2a62f92387b7e68034f946b8d9ea4c7af813482 --- diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c index 9613c4114c..349217a95a 100644 --- a/src/bin/e_desk.c +++ b/src/bin/e_desk.c @@ -836,6 +836,7 @@ E_API void e_desk_geometry_set(E_Desk *desk, int x, int y, int w, int h) { E_Client *ec; + E_Comp_Wl_Client_Data *cdata; E_Maximize max; Eina_List *l = NULL, *ll = NULL; Evas_Object *m; @@ -864,6 +865,7 @@ e_desk_geometry_set(E_Desk *desk, int x, int y, int w, int h) EINA_LIST_FOREACH(sd->clients, l, ec) { + cdata = e_client_cdata_get(ec); /* even if the desktop geometry is chagned, the system partial windows such as virtual * keyboard and clipboard should be placed at the bottom of the desktop. */ /* QUICK FIX */ @@ -871,7 +873,7 @@ e_desk_geometry_set(E_Desk *desk, int x, int y, int w, int h) { continue; } - else if ((ec->comp_data) && (ec->comp_data->sub.data)) + else if (cdata && cdata->sub.data) { continue; } @@ -925,6 +927,7 @@ _animator_cb(void *data, double pos) { E_Desk *desk; E_Client *ec; + E_Comp_Wl_Client_Data *cdata; Eina_List *l; int cx, cy; double zoomx, zoomy; @@ -949,8 +952,9 @@ _animator_cb(void *data, double pos) EINA_LIST_FOREACH(sd->clients, l, ec) { + cdata = e_client_cdata_get(ec); if ((ec->visibility.obscured == E_VISIBILITY_UNOBSCURED) || - (ec->comp_data && ec->comp_data->sub.data)) + (cdata && cdata->sub.data)) _e_desk_client_zoom(ec, zoomx, zoomy, cx, cy); }