orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas/textblock: apply style paddings in fit calculation 

Summary:
The style paddings should be calculated for fitting text into
the given object's size.

Test Plan:
1. Put shadow effect in your style string.
"... style=shadow,far_bottom shadow_color=#000 ..."

2. Apply fit option( and ellipsis to see how it goes wrong without this patch.)

3. See results.

Reviewers: woohyun, ali.alzyod

Reviewed By: woohyun, ali.alzyod

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D12183
This commit is contained in:
Youngbok Shin 2020-10-28 14:50:23 +09:00 committed by WooHyun Jung
parent e9ee9cc3a0
commit 94c2d2295f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -17793,10 +17793,13 @@ int fit_text_block(Evas_Object *eo_obj)
}
else
{
int pad_l, pad_r, pad_t, pad_b;
fit_style_update(eo_obj,fc->p_size_array[mid],EINA_TRUE,bwrap);
Eina_Size2D size = efl_canvas_textblock_size_formatted_get(eo_obj);
wf_new = size.w;
hf_new = size.h;
efl_canvas_textblock_style_insets_get(eo_obj, &pad_l, &pad_r, &pad_t, &pad_b);
wf_new = size.w + pad_l + pad_r;
hf_new = size.h + pad_t + pad_b;
if (fc->p_size_array[mid]<255)
{
fc->size_cache[font_size].w = wf_new;