discomfitor pushed a commit to branch efl-1.10.

http://git.enlightenment.org/core/efl.git/commit/?id=e82b756c155872bf2647872a7e693ec7cacc4ba9

commit e82b756c155872bf2647872a7e693ec7cacc4ba9
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Mon May 26 12:23:29 2014 -0400

    edje should only match swallow visibility if it's actually a group part
---
 src/lib/edje/edje_calc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 85ebf67..bb144d1 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3912,10 +3912,14 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int 
flags, Edje_Calc_Params *sta
           {
              if (pf->visible)
                {
+                  Eina_Bool vis = EINA_TRUE;
+
+                  if (ep->part->type == EDJE_PART_TYPE_GROUP)
+                    vis = evas_object_visible_get(ed->obj);
                   eo_do(ep->typedata.swallow->swallowed_object,
                         evas_obj_position_set(ed->x + pf->final.x, ed->y + 
pf->final.y),
                         evas_obj_size_set(pf->final.w, pf->final.h),
-                        
evas_obj_visibility_set(evas_object_visible_get(ed->obj)));
+                        evas_obj_visibility_set(vis));
                }
              else evas_object_hide(ep->typedata.swallow->swallowed_object);
              mo = ep->typedata.swallow->swallowed_object;

-- 


Reply via email to