From 64eaac722b5336a390979e78465b727a56e392f9 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Wed, 18 Jul 2012 12:36:09 +0000 Subject: [PATCH] elementary/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 as the previous one. SVN revision: 74064 --- legacy/elementary/ChangeLog | 6 ++++++ legacy/elementary/src/lib/elm_mapbuf.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 1473448e54..69f0146ea7 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -322,3 +322,9 @@ * Small fix to account for framespace that is used in wayland (0 in x11 so shouldnt affect x11). + +2012-07-18 Hermet (ChunEon Park) + + * 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 as the previous one. \ No newline at end of file diff --git a/legacy/elementary/src/lib/elm_mapbuf.c b/legacy/elementary/src/lib/elm_mapbuf.c index 866b11a0f6..ec9555eead 100644 --- a/legacy/elementary/src/lib/elm_mapbuf.c +++ b/legacy/elementary/src/lib/elm_mapbuf.c @@ -113,6 +113,8 @@ _mapbuf(Evas_Object *obj) ELM_MAPBUF_DATA_GET(obj, sd); evas_object_geometry_get(ELM_WIDGET_DATA(sd)->resize_obj, &x, &y, &w, &h); + evas_object_resize(sd->content, w, h); + if (sd->enabled) { Evas_Map *m; @@ -130,7 +132,6 @@ _mapbuf(Evas_Object *obj) evas_object_map_set(sd->content, NULL); evas_object_map_enable_set(sd->content, EINA_FALSE); evas_object_move(sd->content, x, y); - evas_object_resize(sd->content, w, h); } } @@ -160,7 +161,6 @@ _configure(Evas_Object *obj) evas_nochange_pop(e); } } - evas_object_resize(sd->content, w, h); _mapbuf(obj); } }