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

ecore-evas-wayland: Fix common window configure callback to not adjust 

for framespace

Summary: As we have already adjusted for framespace in various code
leading up to a configure callback, don't adjust for it here. This
fixes an issue where xdg surface window geometry would get incorrect
values which were including framespace. The values of the
xdg_surface_set_window_geometry should be Just the geometry of the
visible window.

@fix

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-10-12 10:59:33 -04:00
parent 6b943ffa70
commit dbebfc505a
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,27 +191,6 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
if (nw < 1) nw = 1;
if (nh < 1) nh = 1;
if (ee->prop.fullscreen)
{
if ((nw <= 1) || (nh <= 1))
evas_output_size_get(ee->evas, &nw, &nh);
}
else
{
evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
}
if (ECORE_EVAS_PORTRAIT(ee))
{
nw -= fw;
nh -= fh;
}
else
{
nw -= fh;
nh -= fw;
}
if (prev_full != ee->prop.fullscreen)
_ecore_evas_wl_common_border_update(ee);
@ -620,6 +599,9 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
}
}
if (wdata->win)
ecore_wl_window_update_size(wdata->win, ee->req.w, ee->req.h);
evas_output_size_get(ee->evas, &ow, &oh);
if ((ow != w) || (oh != h))
{
@ -651,9 +633,6 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
if (wdata->frame)
evas_object_resize(wdata->frame, w, h);
if (wdata->win)
ecore_wl_window_update_size(wdata->win, w, h);
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
}