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

Edje text: Fix a rare issue causing ellipsis not to work. 

SVN revision: 60240
This commit is contained in:
Tom Hacohen 2011-06-12 14:12:52 +00:00
parent 343a17c08c
commit 4489f92cf3
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/edje/ChangeLog
View File

@ -119,3 +119,7 @@
* Fix external usage in sub group to have the proper parents.
2011-06-11 Tom Hacohen (TAsn)
* Fix an issue with ellipsis not working properly with small
text parts.

11
legacy/edje/src/lib/edje_text.c
View File

@ -148,9 +148,14 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
uc1 = evas_object_text_last_up_to_pos(ep->object,
-p + l, th / 2);
if (params->type.text.elipsis != 1.0)
/* should be the last in text! not the rightmost */
uc2 = evas_object_text_last_up_to_pos(ep->object,
-p + sw - r, th / 2);
{
/* should be the last in text! not the rightmost */
if ((-p + sw -r) < 0)
uc2 = evas_object_text_last_up_to_pos(ep->object, 0, th / 2);
else
uc2 = evas_object_text_last_up_to_pos(ep->object,
-p + sw - r, th / 2);
}
if ((uc1 < 0) && (uc2 < 0))
{
uc1 = 0;