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

Support for -1.0 @ text ellipsis fields -- for not ellipsizing it at all.

This commit is contained in:
Ederson Desouza 2013-06-03 12:02:16 -03:00 committed by Gustavo Lima Chaves
parent ad7622b94a
commit b52a380a5f
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-06-03 Ederson Desouza
* Add -1.0 value to text ellipsis -- for not ellipsizing it at all.
2013-06-03 Carsten Haitzler (The Rasterman)
* Fix edje min size calc to propagate min size calcs to GROUP

4
src/bin/edje/edje_cc_handlers.c
View File

@ -6614,7 +6614,7 @@ st_collections_group_parts_part_description_fill_size_offset(void)
align: X-axis Y-axis;
source: "part_name";
text_source: "text_part_name";
ellipsis: 0.0-1.0;
ellipsis: -1.0 (since 1.8), 0.0-1.0;
style: "stylename";
}
..
@ -7113,7 +7113,7 @@ st_collections_group_parts_part_description_text_elipsis(void)
ed = (Edje_Part_Description_Text*) current_desc;
ed->text.elipsis = parse_float_range(0, 0.0, 1.0);
ed->text.elipsis = parse_float_range(0, -1.0, 1.0);
}

3
src/lib/edje/edje_text.c
View File

@ -91,6 +91,9 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
*free_text = 0;
if (sw <= 1) return "";
if (params->type.text.elipsis < 0)
return text;
if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
eo_do(ep->object,