enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

evas/text: fix the issue that size of evas text object be shorten repeatly when ellipsis is shown. 

Summary:
When the text was shorten by ellipsis, object size was fit to the text width.
If new text was set to the object, the text calculated with the smaller size.
It made shorten the object size when the text is set repeatly.
If the text is cutted off with ellipsis, it means there is no need to
resize the object.

Test Plan: elementary_test -> FileSelector Entry -> Click "Toggle Folder Only mode" button repeatly.

Reviewers: woohyun, tasn, raster, so.penible.animation, Hermet

Reviewed By: raster

CC: cedric, herdsman

Differential Revision: https://phab.enlightenment.org/D636
This commit is contained in:
Youngbok Shin 2014-03-17 19:29:16 +09:00 committed by Carsten Haitzler (Rasterman)
parent 2b84495168
commit 7a4b65c735
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/evas/canvas/evas_object_text.c
View File

@ -60,6 +60,7 @@ struct _Evas_Text_Data
Evas_Object_Text_Item *ellipsis_end;
Evas_Coord w, h;
int advance;
int advance_without_ellipsis;
Eina_Bool ellipsis;
} last_computed;
@ -346,6 +347,12 @@ _evas_object_text_char_at_coords(const Evas_Object *eo_obj,
return -1;
}
static Evas_Coord
_evas_object_text_horiz_advance_without_ellipsis_get(const Evas_Text_Data *o)
{
return o->last_computed.advance_without_ellipsis;
}
static Evas_Coord
_evas_object_text_horiz_advance_get(const Evas_Text_Data *o)
{
@ -748,6 +755,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *t
len -= run_len;
}
}
o->last_computed.advance_without_ellipsis = advance;
if (!o->cur.filter.chain)
evas_text_style_pad_get(o->cur.style, &l, &r, NULL, NULL);
@ -2252,7 +2260,7 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
int w, h;
int l = 0, r = 0, t = 0, b = 0;
w = _evas_object_text_horiz_advance_get(o);
w = _evas_object_text_horiz_advance_without_ellipsis_get(o);
h = _evas_object_text_vert_advance_get(eo_obj, o);
if (!o->cur.filter.chain)
evas_text_style_pad_get(o->cur.style, &l, &r, &t, &b);