From 12aa897e266e19d868fd8a31998da9d452ba6c17 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 5 Jan 2012 05:21:02 +0000 Subject: [PATCH] fixc new recalc cb to be able to call size min recalc in cb. SVN revision: 66893 --- legacy/edje/src/lib/edje_calc.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c index b2f6da6dfd..452663638c 100644 --- a/legacy/edje/src/lib/edje_calc.c +++ b/legacy/edje/src/lib/edje_calc.c @@ -423,17 +423,23 @@ _edje_recalc(Edje *ed) return; } } - if (ed->postponed) return; - evas_object_smart_changed(ed->obj); - ed->postponed = 1; +// XXX: dont need this with current smart calc infra. remove me later +// if (ed->postponed) return; + 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 _edje_recalc_do(Edje *ed) { 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); if (!ed->dirty) return; ed->have_mapped_part = 0; @@ -462,6 +468,8 @@ _edje_recalc_do(Edje *ed) #endif if (!ed->calc_only) evas_object_smart_callback_call(ed->obj, "recalc", NULL); + else + evas_object_smart_need_recalculate_set(ed->obj, need_calc); } void