summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2014-05-26 12:23:29 -0400
committerMike Blumenkrantz <zmike@samsung.com>2014-05-26 12:24:38 -0400
commitd59e2b42fad0508c16e8322326dbbf306b450ede (patch)
tree9c6791ac4c8faa904fc9739bfbad84f4c6645723
parentc625279a85858f64a1c1e4deb3bfec9e63effc7e (diff)
edje should only match swallow visibility if it's actually a group part
-rw-r--r--src/lib/edje/edje_calc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 2419e61181..88595adfc0 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3904,10 +3904,14 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
3904 { 3904 {
3905 if (pf->visible) 3905 if (pf->visible)
3906 { 3906 {
3907 Eina_Bool vis = EINA_TRUE;
3908
3909 if (ep->part->type == EDJE_PART_TYPE_GROUP)
3910 vis = evas_object_visible_get(ed->obj);
3907 eo_do(ep->typedata.swallow->swallowed_object, 3911 eo_do(ep->typedata.swallow->swallowed_object,
3908 evas_obj_position_set(ed->x + pf->final.x, ed->y + pf->final.y), 3912 evas_obj_position_set(ed->x + pf->final.x, ed->y + pf->final.y),
3909 evas_obj_size_set(pf->final.w, pf->final.h), 3913 evas_obj_size_set(pf->final.w, pf->final.h),
3910 evas_obj_visibility_set(evas_object_visible_get(ed->obj))); 3914 evas_obj_visibility_set(vis));
3911 } 3915 }
3912 else evas_object_hide(ep->typedata.swallow->swallowed_object); 3916 else evas_object_hide(ep->typedata.swallow->swallowed_object);
3913 mo = ep->typedata.swallow->swallowed_object; 3917 mo = ep->typedata.swallow->swallowed_object;