woohyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=287ec502032d499085229b820cab053e7df28a01
commit 287ec502032d499085229b820cab053e7df28a01 Author: Ali Alzyod <[email protected]> Date: Wed May 6 20:33:42 2020 +0900 edje_textblock: content_fit size_range update Summary: update size range will skip empty font_sizes Reviewers: woohyun, bowonryu Reviewed By: woohyun Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11507 --- src/lib/edje/edje_textblock.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/lib/edje/edje_textblock.c b/src/lib/edje/edje_textblock.c index 5711c7040f..38b737a508 100644 --- a/src/lib/edje/edje_textblock.c +++ b/src/lib/edje/edje_textblock.c @@ -539,12 +539,15 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, Evas_Textblock_Style *st = _edje_textblock_style_get(ed, chosen_desc->text.style.str); const char *text_style = evas_textblock_style_get(st); char *s_font_size = (text_style) ? strrstr(text_style,"font_size=") : NULL; - if (s_font_size) + if (s_font_size && s_font_size[10]) { - int font_size = strtol(&s_font_size[10], NULL, 10); - chosen_desc->text.size_range_max = font_size; - if (chosen_desc->text.size_range_min > chosen_desc->text.size_range_max) - chosen_desc->text.size_range_min = chosen_desc->text.size_range_max; + int font_size = (int) strtol(&s_font_size[10], NULL, 10); + if (font_size > 0) + { + chosen_desc->text.size_range_max = font_size; + if (chosen_desc->text.size_range_min > chosen_desc->text.size_range_max) + chosen_desc->text.size_range_min = chosen_desc->text.size_range_max; + } } EINA_LIST_FOREACH(chosen_desc->text.fit_size_array, l, value) { --
