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

edje - calc - handle swallow disappearing mid-calc due to callabcks 

callbacks attached to move/resize etc. can change a swallow and ..
well.. i hit a crash where it happens. so handle this case.

@fix
This commit is contained in:
Carsten Haitzler 2020-09-03 09:41:35 +01:00
parent 5065c9d0c2
commit 9544c87428
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4761,7 +4761,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
}
if (!ed->calc_only)
{
Evas_Object *mo;
Evas_Object *mo = NULL;
/* Common move, resize and color_set for all part. */
switch (ep->part->type)
@ -4945,12 +4945,17 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
if (ep->part->type == EDJE_PART_TYPE_GROUP)
vis = evas_object_visible_get(ed->obj);
efl_gfx_entity_position_set(ep->typedata.swallow->swallowed_object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
efl_gfx_entity_size_set(ep->typedata.swallow->swallowed_object, EINA_SIZE2D(pf->final.w, pf->final.h));
efl_gfx_entity_visible_set(ep->typedata.swallow->swallowed_object, vis);
if (ep->typedata.swallow)
efl_gfx_entity_position_set(ep->typedata.swallow->swallowed_object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
if (ep->typedata.swallow)
efl_gfx_entity_size_set(ep->typedata.swallow->swallowed_object, EINA_SIZE2D(pf->final.w, pf->final.h));
if (ep->typedata.swallow)
efl_gfx_entity_visible_set(ep->typedata.swallow->swallowed_object, vis);
}
else evas_object_hide(ep->typedata.swallow->swallowed_object);
mo = ep->typedata.swallow->swallowed_object;
else if (ep->typedata.swallow)
evas_object_hide(ep->typedata.swallow->swallowed_object);
if (ep->typedata.swallow)
mo = ep->typedata.swallow->swallowed_object;
}
else mo = ep->object;
if (ep->part->type != EDJE_PART_TYPE_SPACER)