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

ecore-evas-wayland: Don't resize ecore_wl window to include frame size 

Summary: ecore_wl_window_resize adjusts the internal representation of
the window size so this should not include the "framespace" also. This
fixes an issue where xdg surface would be getting an incorrect window
geometry which included framespace.

@fix

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-10-12 10:58:00 -04:00
parent 6263fcc716
commit 6b943ffa70
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
View File

@ -334,7 +334,6 @@ _ecore_evas_wl_show(Ecore_Evas *ee)
{
ecore_wl_window_show(wdata->win);
ecore_wl_window_alpha_set(wdata->win, ee->alpha);
ecore_wl_window_update_size(wdata->win, ee->w + fw, ee->h + fh);
einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(ee->evas);
if (einfo)
@ -496,16 +495,12 @@ _ecore_evas_wayland_egl_resize(Ecore_Evas *ee, int location)
wdata = ee->engine.data;
if (wdata->win)
{
int fw, fh;
_ecore_evas_wayland_egl_resize_edge_set(ee, location);
evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
if (ECORE_EVAS_PORTRAIT(ee))
ecore_wl_window_resize(wdata->win, ee->w + fw, ee->h + fh, location);
ecore_wl_window_resize(wdata->win, ee->w, ee->h, location);
else
ecore_wl_window_resize(wdata->win, ee->w + fh, ee->h + fw, location);
ecore_wl_window_resize(wdata->win, ee->w, ee->h, location);
}
}

9
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
View File

@ -329,7 +329,6 @@ _ecore_evas_wl_show(Ecore_Evas *ee)
{
ecore_wl_window_show(wdata->win);
ecore_wl_window_alpha_set(wdata->win, ee->alpha);
ecore_wl_window_update_size(wdata->win, ee->w + fw, ee->h + fh);
einfo = (Evas_Engine_Info_Wayland_Shm *)evas_engine_info_get(ee->evas);
if (einfo)
@ -489,16 +488,12 @@ _ecore_evas_wayland_shm_resize(Ecore_Evas *ee, int location)
wdata = ee->engine.data;
if (wdata->win)
{
int fw, fh;
_ecore_evas_wayland_shm_resize_edge_set(ee, location);
evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
if (ECORE_EVAS_PORTRAIT(ee))
ecore_wl_window_resize(wdata->win, ee->w + fw, ee->h + fh, location);
ecore_wl_window_resize(wdata->win, ee->w, ee->h, location);
else
ecore_wl_window_resize(wdata->win, ee->w + fh, ee->h + fw, location);
ecore_wl_window_resize(wdata->win, ee->w, ee->h, location);
}
}