From b1864d554f562322a1f1dbf022f2c5a084a0b5b9 Mon Sep 17 00:00:00 2001 From: devilhorns Date: Mon, 2 Jan 2012 19:36:11 +0000 Subject: [PATCH] Ecore_Evas: Fix resize recursion when using wayland framespace. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@66760 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_evas/ecore_evas_util.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c index 6aa6784..839f0c8 100644 --- a/src/lib/ecore_evas/ecore_evas_util.c +++ b/src/lib/ecore_evas/ecore_evas_util.c @@ -116,15 +116,16 @@ _ecore_evas_obj_callback_hide(void *data, Evas *e __UNUSED__, Evas_Object *obj _ } static void -_ecore_evas_obj_callback_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_ecore_evas_obj_callback_resize(void *data, Evas *e, Evas_Object *obj, void *event_info __UNUSED__) { Ecore_Evas *ee = data; - Evas_Coord ow, oh, w, h; + Evas_Coord ow, oh, fw, fh; evas_object_geometry_get(obj, NULL, NULL, &ow, &oh); - ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - /*if ((w != ow) || (h != oh))*/ /* avoid recursion on ecore_evas_resize side */ - ecore_evas_resize(ee, ow, oh); + evas_output_framespace_get(e, NULL, NULL, &fw, &fh); + ow += fw; + oh += fh; + ecore_evas_resize(ee, ow, oh); } static void -- 2.7.4