From: ChunEon Park <hermet@hermet.pe.kr>
Date: Wed, 18 Jul 2012 12:36:09 +0000 (+0000)
Subject: elementary/mapbuf - Fix the mapbuf to resize the contents(smart obj) correctly.
X-Git-Tag: v1.7.0~293
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e53838e2d42414b5c890880dcdb0e81fbd8bff85;p=platform%2Fupstream%2Felementary.git

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
---

diff --git a/ChangeLog b/ChangeLog
index 1473448..69f0146 100644
--- a/ChangeLog
+++ b/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/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c
index 866b11a..ec9555e 100644
--- a/src/lib/elm_mapbuf.c
+++ b/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);
      }
 }