Ecore_Evas (wayland): Account for framespace width & height when

resizing the Ecore_Evas.

SVN revision: 74566

diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c
index ba7467a..b429239 100644 (file)
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c
@@ -446,6 +446,7 @@ static void
 _ecore_evas_wl_resize(Ecore_Evas *ee, int w, int h)
 {
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   int fw = 0, fh = 0;
 
    if (!ee) return;
    if (w < 1) w = 1;
@@ -459,6 +460,10 @@ _ecore_evas_wl_resize(Ecore_Evas *ee, int w, int h)
    ee->req.w = w;
    ee->req.h = h;
 
+   evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
+   w += fw;
+   h += fh;
+
 //   ecore_wl_window_damage(ee->engine.wl.win, 0, 0, ee->w, ee->h);
 
    if ((ee->w != w) || (ee->h != h))

diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c
index a05ecfe..b9c6d18 100644 (file)
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c
@@ -455,6 +455,7 @@ static void
 _ecore_evas_wl_resize(Ecore_Evas *ee, int w, int h)
 {
    Evas_Engine_Info_Wayland_Shm *einfo;
+   int fw = 0, fh = 0;
 
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
 
@@ -470,6 +471,10 @@ _ecore_evas_wl_resize(Ecore_Evas *ee, int w, int h)
    ee->req.w = w;
    ee->req.h = h;
 
+   evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
+   w += fw;
+   h += fh;
+
    if ((ee->w != w) || (ee->h != h))
      {
         ee->w = w;