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

diff --git a/packaging/elementary.spec b/packaging/elementary.spec
index ec24845..c340543 100644 (file)
--- 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 (file)
--- 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);
      }
 }