edje_calc: Exception handling if no calculation is required.

If there is no object swllowed, do not run part_calc on it.
This swallow will be calculated if there is an associated part, otherwise it will not need to be calculated.

When the app is launched, a lot of edje calculation logic is executed.
Most of the edje size is missing, so the calculation result is meaningless.
Added code to prevent this.

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D10605

1 files changed, 37 insertions, 0 deletions

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 59349b40b4..736ccb4b53 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -988,6 +988,13 @@ _edje_recalc_table_parts(Edje *ed
    for (i = 0; i < ed->table_parts_size; i++)
      {
         ep = ed->table_parts[i];
+
+        //Ignore if the real part doesn't have swallowed object
+        if ((ep->part->type == EDJE_PART_TYPE_SWALLOW) &&
+            (ep->typedata.swallow) &&
+            (!ep->typedata.swallow->swallowed_object))
+          continue;
+
         if (ep->calculated != FLAG_XY) // FIXME: this is always true (see for above)
           _edje_part_recalc(ed, ep, (~ep->calculated) & FLAG_XY, NULL);
      }
@@ -997,6 +1004,25 @@ _edje_recalc_table_parts(Edje *ed
 }
 
 void
+_edje_recalc_textblock_style_text_set(Edje *ed)
+{
+   unsigned short i;
+   Edje_Real_Part *ep;
+   Edje_Part_Description_Text *chosen_desc;
+
+   for (i = 0; i < ed->table_parts_size; i++)
+     {
+        ep = ed->table_parts[i];
+
+        if (ep->part->type == EDJE_PART_TYPE_TEXTBLOCK)
+          {
+             _edje_part_textblock_style_text_set
+               (ed, ep, (Edje_Part_Description_Text *)ep->chosen_description);
+          }
+     }
+}
+
+void
 _edje_recalc_do(Edje *ed)
 {
    unsigned short i;
@@ -1005,6 +1031,17 @@ _edje_recalc_do(Edje *ed)
    Eina_Bool need_reinit_state = EINA_FALSE;
 #endif
 
+
+   //Do nothing if the edje has no size, Regardless of the edje part size calc,
+   //the text and style has to be set.
+   if ((EINA_UNLIKELY(!ed->has_size)) && (!ed->calc_only) && (ed->w == 0) && (ed->h == 0))
+     {
+        _edje_recalc_textblock_style_text_set(ed);
+
+        return;
+     }
+   ed->has_size = EINA_TRUE;
+
    need_calc = evas_object_smart_need_recalculate_get(ed->obj);
    evas_object_smart_need_recalculate_set(ed->obj, 0);
    if (!ed->dirty) return;