summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzmike <michael.blumenkrantz@gmail.com>2014-08-14 14:17:11 -0400
committerzmike <michael.blumenkrantz@gmail.com>2014-08-14 14:19:04 -0400
commit0ece308bb15fa8fd1a002cdbcd9fe05bbc7b7902 (patch)
tree4131b12668fb01094a79c51a4087f17d71944c10
parent0823a2159f938b4749baa276c2a2b4c3f43eb41c (diff)
downloadefl-0ece308bb15fa8fd1a002cdbcd9fe05bbc7b7902.tar.gz
edje text should actually call ellipsis functions instead of attempting to call -1(obj)
-rw-r--r--src/lib/edje/edje_text.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index 70392e5494..63ca83f2cc 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -98,7 +98,7 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
eo_do(ep->object,
- chosen_desc->text.min_x ? -1 : evas_obj_text_ellipsis_set(params->type.text.ellipsis),
+ evas_obj_text_ellipsis_set(chosen_desc->text.min_x ? -1 : params->type.text.ellipsis),
evas_obj_text_font_set(font, size),
evas_obj_text_set(text),
evas_obj_size_set(sw, sh));
@@ -457,8 +457,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
*/
else if (((ed->file->version >= 3) && (ed->file->minor >= 6)) ||
params->type.text.ellipsis)
- eo_do(ep->object,
- chosen_desc->text.min_x ? -1 : evas_obj_text_ellipsis_set(params->type.text.ellipsis));
+ evas_object_text_ellipsis_set(ep->object,
+ chosen_desc->text.min_x ? -1 : params->type.text.ellipsis);
eina_stringshare_replace(&ep->typedata.text->cache.out_str, text);
ep->typedata.text->cache.in_w = sw;