devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6b943ffa7079d0e24a1287224e5aec99037cd62a
commit 6b943ffa7079d0e24a1287224e5aec99037cd62a
Author: Chris Michael <cp.mich...@samsung.com>
Date: Mon Oct 12 10:58:00 2015 -0400
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.mich...@samsung.com>
---
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 9 ++-------
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 9 ++-------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 1ba7542..71c7e02 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -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);
}
}
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index bf3f5fb..19940ca 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -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);
}
}
--
