forked from enlightenment/efl
fixc new recalc cb to be able to call size min recalc in cb.
SVN revision: 66893
This commit is contained in:
parent
6eb708fb1d
commit
12aa897e26
|
@ -423,17 +423,23 @@ _edje_recalc(Edje *ed)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ed->postponed) return;
|
// XXX: dont need this with current smart calc infra. remove me later
|
||||||
evas_object_smart_changed(ed->obj);
|
// if (ed->postponed) return;
|
||||||
ed->postponed = 1;
|
if (!ed->calc_only)
|
||||||
|
evas_object_smart_changed(ed->obj);
|
||||||
|
// XXX: dont need this with current smart calc infra. remove me later
|
||||||
|
// ed->postponed = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
_edje_recalc_do(Edje *ed)
|
_edje_recalc_do(Edje *ed)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
Eina_Bool need_calc;
|
||||||
|
|
||||||
ed->postponed = 0;
|
// XXX: dont need this with current smart calc infra. remove me later
|
||||||
|
// ed->postponed = 0;
|
||||||
|
need_calc = evas_object_smart_need_recalculate_get(ed->obj);
|
||||||
evas_object_smart_need_recalculate_set(ed->obj, 0);
|
evas_object_smart_need_recalculate_set(ed->obj, 0);
|
||||||
if (!ed->dirty) return;
|
if (!ed->dirty) return;
|
||||||
ed->have_mapped_part = 0;
|
ed->have_mapped_part = 0;
|
||||||
|
@ -462,6 +468,8 @@ _edje_recalc_do(Edje *ed)
|
||||||
#endif
|
#endif
|
||||||
if (!ed->calc_only)
|
if (!ed->calc_only)
|
||||||
evas_object_smart_callback_call(ed->obj, "recalc", NULL);
|
evas_object_smart_callback_call(ed->obj, "recalc", NULL);
|
||||||
|
else
|
||||||
|
evas_object_smart_need_recalculate_set(ed->obj, need_calc);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue