Revert "Revert "edje: Skip calculation for Evas Textblock when text is never set""

This reverts commit 30367ebac3fcedab84228d661f91f989394a1741.

Change-Id: I72c2e7bc99ea9ebc4bae21c24856ca697ed92f30
Signed-off-by: WooHyun Jung <wh0705.jung@samsung.com>

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index fe4f92fc24eab0be0b127d7046d9b74fd926ceab..ef47b8180515ffd59a8e11b5598de786b006cdab 100644 (file)
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -1429,6 +1429,16 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
    if ((ep->type != EDJE_RP_TYPE_TEXT) ||
        (!ep->typedata.text))
      return;
+
+   // TIZEN_ONLY(20150921): Skip calculation for Evas Textblock when text is never set.
+   if (!(ep->typedata.text->text_enabled) && (ep->part->entry_mode == EDJE_ENTRY_EDIT_MODE_NONE) &&
+       (!ep->typedata.text->text) && (!edje_string_get(&chosen_desc->text.text)) &&
+       (chosen_desc && !(chosen_desc->text.id_text_source >= 0)))
+     return;
+
+   if (!ep->typedata.text->text_enabled) ep->typedata.text->text_enabled = EINA_TRUE;
+   //
+
    if (chosen_desc)
      {
         Evas_Coord tw, th, ins_l, ins_r, ins_t, ins_b;

diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 49358235bad9e532ef4b77b7ec4965db0f46732f..2424f58d425baae7f47891ea402bfd7b92c443ae 100644 (file)
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -1872,6 +1872,10 @@ struct _Edje_Real_Part_Text
       FLOAT_T             align_x, align_y; // 16
    } cache;
    Edje_Part_Description_Spec_Filter filter; // 8
+
+   // TIZEN_ONLY(20150921): Skip calculation for Evas Textblock when text is never set.
+   Eina_Bool              text_enabled : 1;
+   //
 }; // 88
 // FIXME make text a potiner to struct and alloc at end
 // if part type is TEXT move common members textblock +