edje: don't run legacy calculation for Textblock parts

Tizen will ignore legacy calculation logics for Textblock parts.

@tizen_fix

Change-Id: I886fc39a2385f1153e76f124497b2fa579f65bab

diff --git a/src/lib/edje/edje_textblock.c b/src/lib/edje/edje_textblock.c
index ad19b67..be4d3d3 100644 (file)
--- a/src/lib/edje/edje_textblock.c
+++ b/src/lib/edje/edje_textblock.c
@@ -610,6 +610,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
                   evas_object_textblock_text_markup_set(ep->object, text);
                }
 
+             /* TIZEN_ONLY(20180103): don't run legacy calculation for Textblock parts
              if ((ed->file->efl_version.major >= 1) && (ed->file->efl_version.minor >= 19))
                {
                   _edje_part_recalc_single_textblock_min_max_calc(ep,
@@ -626,6 +627,13 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
                                                                          minw, minh,
                                                                          maxw, maxh);
                }
+              */
+             _edje_part_recalc_single_textblock_min_max_calc(ep,
+                                                             chosen_desc,
+                                                             params,
+                                                             minw, minh,
+                                                             maxw, maxh);
+             /* END */
           }
 
         /***********************************************************************************

diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 3e62ebd..320e5f4 100644 (file)
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -3452,10 +3452,14 @@ _efl_canvas_layout_efl_layout_calc_calc_size_min(Eo *obj EINA_UNUSED, Edje *ed,
     * To keep backward compatibility, legacy_calc will be used for old version of EDJ files.
     * With enabling legacy_calc, You can't see proper min/max result accroding to documents.
     */
+   /* TIZEN_ONLY(20180103): don't run legacy calculation for Textblock parts
    if (!ed->file || ((ed->file->efl_version.major >= 1) && (ed->file->efl_version.minor >= 19)))
      legacy_calc = EINA_FALSE;
    else
      legacy_calc = EINA_TRUE;
+    */
+   legacy_calc = EINA_FALSE;
+   /* END */
 
    //Simulate object minimum size.
    ed->calc_only = EINA_TRUE;