kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edje should only match swallow visibility if it's actually a group part 

fixes visibility of actual swallow parts
This commit is contained in:
Mike Blumenkrantz 2014-05-26 12:23:29 -04:00
parent ceb13556b1
commit 91bd7fa913
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/edje/edje_calc.c
View File

@ -3912,10 +3912,14 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
{ {
if (pf->visible) 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, eo_do(ep->typedata.swallow->swallowed_object,
evas_obj_position_set(ed->x + pf->final.x, ed->y + pf->final.y), 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_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); else evas_object_hide(ep->typedata.swallow->swallowed_object);
mo = ep->typedata.swallow->swallowed_object; mo = ep->typedata.swallow->swallowed_object;