From b52a380a5f3e198c25b27e540315268c75e6d6cf Mon Sep 17 00:00:00 2001 From: Ederson Desouza Date: Mon, 3 Jun 2013 12:02:16 -0300 Subject: [PATCH] Support for -1.0 @ text ellipsis fields -- for not ellipsizing it at all. --- ChangeLog | 4 ++++ src/bin/edje/edje_cc_handlers.c | 4 ++-- src/lib/edje/edje_text.c | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51363d4..d81ed9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 7017816..1738beb 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -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); } diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c index bb1cf9a..964bc83 100644 --- a/src/lib/edje/edje_text.c +++ b/src/lib/edje/edje_text.c @@ -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, -- 2.7.4