From 37237c075439a1aa749a37cb0aff7a301f0f66e7 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 19 Jul 2012 12:27:15 +0900 Subject: [PATCH] mapbuf - Fix the mapbuf to resize the contents(smart obj) correctly. When smart obj was set as the contents the _configure would be called recursively. In this process the lastest size could be reverted to the previous one. Change-Id: I1d4637b2e8560f658b3897471c58e43271193c4c --- packaging/elementary.spec | 2 +- src/lib/elm_mapbuf.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packaging/elementary.spec b/packaging/elementary.spec index ec24845..c340543 100644 --- a/packaging/elementary.spec +++ b/packaging/elementary.spec @@ -1,7 +1,7 @@ #sbs-git:slp/pkgs/e/elementary elementary 1.0.0+svn.70492slp2+build11 Name: elementary Summary: EFL toolkit for small touchscreens -Version: 1.0.0+svn.70492slp2+build11 +Version: 1.0.0+svn.70492slp2+build12 Release: 1 Group: System/Libraries License: LGPLv2.1 diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c index 4608872..0aae072 100644 --- a/src/lib/elm_mapbuf.c +++ b/src/lib/elm_mapbuf.c @@ -80,6 +80,7 @@ _mapbuf(Evas_Object *obj) Evas_Coord x, y, w, h; if (!wd) return; evas_object_geometry_get(wd->clip, &x, &y, &w, &h); + evas_object_resize(wd->content, w, h); if (wd->enabled) { Evas_Map *m; @@ -97,7 +98,6 @@ _mapbuf(Evas_Object *obj) evas_object_map_set(wd->content, NULL); evas_object_map_enable_set(wd->content, EINA_FALSE); evas_object_move(wd->content, x, y); - evas_object_resize(wd->content, w, h); } } @@ -127,7 +127,6 @@ _configure(Evas_Object *obj) evas_nochange_pop(e); } } - evas_object_resize(wd->content, w, h); _mapbuf(obj); } } -- 2.7.4