[EGIT] [tools/eflete] master 06/06: groupview: fix wrong protrusion calc on first load

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=cb1cc9a9d1e7d71bcc84611a51ba399b86db3776

commit cb1cc9a9d1e7d71bcc84611a51ba399b86db3776
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Wed Apr 27 11:55:10 2016 +0300

    groupview: fix wrong protrusion calc on first load
    
    Fixes T3517
    
    Change-Id: Ie43d630ee1e410b79940c72af6a0c583c2b03120
---
 src/bin/ui/workspace/container.c |  1 +
 src/bin/ui/workspace/groupview.c | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bin/ui/workspace/container.c b/src/bin/ui/workspace/container.c
index b242845..8eb0fe8 100644
--- a/src/bin/ui/workspace/container.c
+++ b/src/bin/ui/workspace/container.c
@@ -326,6 +326,7 @@ _container_smart_calculate(Evas_Object *o)
      sd->size.h = sd->con_size_max.h * sd->zoom;
 
    evas_object_resize(sd->container, sd->size.w, sd->size.h);
+   evas_object_resize(sd->content, sd->size.w, sd->size.h);
 
    /* 2. get the content protrusion */
    if (sd->func) geom = sd->func(sd->content);
diff --git a/src/bin/ui/workspace/groupview.c b/src/bin/ui/workspace/groupview.c
index 179674d..3f8ee53 100644
--- a/src/bin/ui/workspace/groupview.c
+++ b/src/bin/ui/workspace/groupview.c
@@ -204,6 +204,11 @@ _groupview_smart_resize(Evas_Object *o,
    sd->zoom1.w = w / sd->zoom;
    sd->zoom1.h = h / sd->zoom;
 
+   evas_object_resize(sd->group->edit_object, sd->zoom1.w, sd->zoom1.h);
+   evas_object_resize(sd->box, w, h);
+   /* I hate box, we need force call the box calc for get the correct 
protrusion */
+   elm_box_recalculate(sd->box);
+
    evas_object_smart_changed(o);
 }
 
@@ -219,7 +224,6 @@ _groupview_smart_calculate(Evas_Object *o)
    evas_object_move(sd->event, px, py);
 
    evas_object_geometry_get(o, &x, &y, &w, &h);
-
    if ((sd->geom.w != w) || (sd->geom.h != h))
      {
         sd->geom.x = x;
@@ -227,12 +231,7 @@ _groupview_smart_calculate(Evas_Object *o)
         sd->geom.w = w;
         sd->geom.h = h;
 
-        evas_object_resize(sd->group->edit_object, sd->zoom1.w, sd->zoom1.h);
-        evas_object_resize(sd->box, w, h);
      }
-   else
-     elm_box_recalculate(sd->box);
-
    sd->manual_calc = false;
 
    DBG("Groupview geometry: x[%i] y[%i] w[%i] h[%i]", x, y, w, h);

--