From 4447e10b6337c72a0734cc9831055adff3dcc9af Mon Sep 17 00:00:00 2001 From: Ali Date: Wed, 6 May 2020 20:30:14 +0900 Subject: [PATCH] edje_textblock: optimize priority handling for content_fit options Summary: this patch will reduce amount of unnessesary calculations, if user set both font_size_array and size_range for content fit. Reviewers: woohyun, bowonryu Reviewed By: woohyun Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11498 --- src/lib/edje/edje_textblock.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/edje/edje_textblock.c b/src/lib/edje/edje_textblock.c index fe3ec439fb..5711c7040f 100644 --- a/src/lib/edje/edje_textblock.c +++ b/src/lib/edje/edje_textblock.c @@ -558,12 +558,14 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, mode |= TEXTBLOCK_FIT_MODE_HEIGHT; evas_textblock_fit_options_set(ep->object, mode); evas_textblock_fit_step_size_set(ep->object, chosen_desc->text.fit_step); - if ( chosen_desc->text.size_range_min || chosen_desc->text.size_range_max) - evas_textblock_fit_size_range_set(ep->object, chosen_desc->text.size_range_min, chosen_desc->text.size_range_max); - if (size_array_len>0) + if (size_array_len > 0) { evas_textblock_fit_size_array_set(ep->object,size_array,size_array_len); } + else if ( chosen_desc->text.size_range_min || chosen_desc->text.size_range_max) + { + evas_textblock_fit_size_range_set(ep->object, chosen_desc->text.size_range_min, chosen_desc->text.size_range_max); + } } if ((ed->file->efl_version.major >= 1) && (ed->file->efl_version.minor >= 19))