hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ee_wayland: Replace set_config.geometry direct use with getters 

I'm going to deal with some ugly geometry problems in the getter func
shortly.

Signed-off-by: Derek Foreman <derek.foreman.samsung@gmail.com>
Reviewed-by: Chris Michael <cp.michael@samsung.com>
Differential Revision: https://phab.enlightenment.org/D7432
This commit is contained in:
Derek Foreman 2018-11-28 14:19:56 -06:00
parent f53c7341c3
commit 56f7097e17
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
View File

@ -584,6 +584,7 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
Ecore_Evas_Engine_Wl_Data *wdata; Ecore_Evas_Engine_Wl_Data *wdata;
Ecore_Wl2_Event_Window_Configure *ev; Ecore_Wl2_Event_Window_Configure *ev;
int nw = 0, nh = 0, fw, fh, pfw, pfh, sw, sh, contentw, contenth; int nw = 0, nh = 0, fw, fh, pfw, pfh, sw, sh, contentw, contenth;
int ww, wh;
int framew, frameh; int framew, frameh;
Eina_Bool active, prev_max, prev_full, state_change = EINA_FALSE; Eina_Bool active, prev_max, prev_full, state_change = EINA_FALSE;
@ -617,13 +618,15 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
nw = ev->w; nw = ev->w;
nh = ev->h; nh = ev->h;
ecore_wl2_window_geometry_get(wdata->win, NULL, NULL, &ww, &wh);
sw = ee->shadow.l + ee->shadow.r; sw = ee->shadow.l + ee->shadow.r;
sh = ee->shadow.t + ee->shadow.b; sh = ee->shadow.t + ee->shadow.b;
evas_output_framespace_get(ee->evas, NULL, NULL, &framew, &frameh); evas_output_framespace_get(ee->evas, NULL, NULL, &framew, &frameh);
contentw = wdata->win->set_config.geometry.w - (framew - sw); contentw = ww - (framew - sw);
contenth = wdata->win->set_config.geometry.h - (frameh - sh); contenth = wh - (frameh - sh);
pfw = fw = wdata->win->set_config.geometry.w - contentw; pfw = fw = ww - contentw;
pfh = fh = wdata->win->set_config.geometry.h - contenth; pfh = fh = wh - contenth;
if ((prev_max != ee->prop.maximized) || if ((prev_max != ee->prop.maximized) ||
(prev_full != ee->prop.fullscreen) || (prev_full != ee->prop.fullscreen) ||
@ -634,10 +637,10 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
sw = ee->shadow.l + ee->shadow.r; sw = ee->shadow.l + ee->shadow.r;
sh = ee->shadow.t + ee->shadow.b; sh = ee->shadow.t + ee->shadow.b;
evas_output_framespace_get(ee->evas, NULL, NULL, &framew, &frameh); evas_output_framespace_get(ee->evas, NULL, NULL, &framew, &frameh);
contentw = wdata->win->set_config.geometry.w - (framew - sw); contentw = ww - (framew - sw);
contenth = wdata->win->set_config.geometry.h - (frameh - sh); contenth = wh - (frameh - sh);
fw = wdata->win->set_config.geometry.w - contentw; fw = ww - contentw;
fh = wdata->win->set_config.geometry.h - contenth; fh = wh - contenth;
} }
if ((!nw) && (!nh)) if ((!nw) && (!nh))
{ {
@ -1877,10 +1880,11 @@ _ecore_evas_wl_common_render_flush_pre(void *data, Evas *evas, void *event EINA_
/* Surviving bits of WWW - track interesting state we might want /* Surviving bits of WWW - track interesting state we might want
* to pass to clients to do client side effects * to pass to clients to do client side effects
*/ */
einfo->window.x = wdata->win->set_config.geometry.x; ecore_wl2_window_geometry_get(wdata->win,
einfo->window.y = wdata->win->set_config.geometry.y; &einfo->window.x,
einfo->window.w = wdata->win->set_config.geometry.w; &einfo->window.y,
einfo->window.h = wdata->win->set_config.geometry.h; &einfo->window.w,
&einfo->window.h);
if (einfo->resizing) if (einfo->resizing)
{ {
einfo->x_rel = 0; einfo->x_rel = 0;