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
This commit is contained in:
Ali Alzyod 2020-05-06 20:30:14 +09:00 committed by WooHyun Jung
parent 4976097bd4
commit 4447e10b63
1 changed files with 5 additions and 3 deletions

View File

@ -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))