enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Evas object text: Make the object size big enough to show the whole text. 

I.e even if advance is smaller than width, take it into account.

SVN revision: 71507
This commit is contained in:
Tom Hacohen 2012-05-29 14:43:21 +00:00
parent af55fb6217
commit ef25a41a76
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/evas/ChangeLog
View File

@ -768,5 +768,6 @@
2012-05-29 Tom Hacohen (TAsn) 2012-05-29 Tom Hacohen (TAsn)
* Text: Fixed an issue with text object sizing.
* Font: Fixed run-time italic. * Font: Fixed run-time italic.

6
legacy/evas/src/lib/canvas/evas_object_text.c
View File

@ -238,7 +238,7 @@ static Evas_Coord
_evas_object_text_horiz_advance_get(const Evas_Object *obj, _evas_object_text_horiz_advance_get(const Evas_Object *obj,
const Evas_Object_Text *o) const Evas_Object_Text *o)
{ {
Evas_Object_Text_Item *it; Evas_Object_Text_Item *it, *last_it = NULL;
Evas_Coord adv; Evas_Coord adv;
(void) obj; (void) obj;
@ -246,7 +246,11 @@ _evas_object_text_horiz_advance_get(const Evas_Object *obj,
EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it) EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it)
{ {
adv += it->adv; adv += it->adv;
last_it = it;
} }
if (last_it && (last_it->w > last_it->adv))
adv += last_it->w - last_it->adv;
return adv; return adv;
} }