From 3090d899757efc3c4de3841541ab0c4e115ce709 Mon Sep 17 00:00:00 2001 From: Youngbok Shin Date: Mon, 5 Feb 2018 17:08:53 +0900 Subject: [PATCH] edje: don't calculate textblock twice It will trigger additional size calculation only for fit option. The fit option can be calculated at once. It is a hack. @tizen_fix Change-Id: I1c4ee71766e64c83bd262f207e4671e4846ca4d8 (cherry picked from commit a18ffc18aba1c8998af4e27693e192e5f760b895) --- src/lib/edje/edje_calc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 81b76de..d60d0e5 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -2151,12 +2151,13 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, } } +/* TIZEN_ONLY(20180205): don't calculate textblock twice static void _edje_textblock_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *params, Edje_Part_Description_Text *chosen_desc) { - /* FIXME: this is just an hack. */ + // FIXME: this is just an hack. FLOAT_T sc; sc = DIV(ed->scale, ed->file->base_scale); if (sc == ZERO) sc = DIV(_edje_scale, ed->file->base_scale); @@ -2166,6 +2167,8 @@ _edje_textblock_recalc_apply(Edje *ed, Edje_Real_Part *ep, NULL, NULL, NULL, NULL); } } + */ +/* END */ static void _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED, @@ -5424,7 +5427,10 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta break; case EDJE_PART_TYPE_TEXTBLOCK: + /* TIZEN_ONLY(20180205): don't calculate textblock twice _edje_textblock_recalc_apply(ed, ep, pf, (Edje_Part_Description_Text *)chosen_desc); + */ + /* END */ break; case EDJE_PART_TYPE_VECTOR: -- 2.7.4