From b619b6bfd450ac90a9d04c5066039d729ff0f3d5 Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Mon, 6 May 2013 20:06:13 -0300 Subject: [PATCH] ecore_evas/wayland: Correctly use framespace size for ecore_evas_resize. --- .../ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 3 +++ .../ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 89b5ee9078..f77502458a 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 @@ -241,6 +241,7 @@ _ecore_evas_wl_resize(Ecore_Evas *ee, int w, int h) Ecore_Evas_Engine_Wl_Data *wdata; LOGFN(__FILE__, __LINE__, __FUNCTION__); int orig_w, orig_h; + int ow, oh; if (!ee) return; if (w < 1) w = 1; @@ -277,6 +278,8 @@ _ecore_evas_wl_resize(Ecore_Evas *ee, int w, int h) } } + evas_output_size_get(ee->evas, &ow, &oh); + if ((ow != w) || (oh != h)) if ((ee->w != w) || (ee->h != h)) { ee->w = orig_w; 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 523b47854c..871b796572 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 @@ -252,6 +252,7 @@ _ecore_evas_wl_resize(Ecore_Evas *ee, int w, int h) { Ecore_Evas_Engine_Wl_Data *wdata; int orig_w, orig_h; + int ow, oh; LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -291,7 +292,8 @@ _ecore_evas_wl_resize(Ecore_Evas *ee, int w, int h) } } - if ((ee->w != w) || (ee->h != h)) + evas_output_size_get(ee->evas, &ow, &oh); + if ((ow != w) || (oh != h)) { ee->w = orig_w; ee->h = orig_h;