discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0ece308bb15fa8fd1a002cdbcd9fe05bbc7b7902
commit 0ece308bb15fa8fd1a002cdbcd9fe05bbc7b7902 Author: zmike <[email protected]> Date: Thu Aug 14 14:17:11 2014 -0400 edje text should actually call ellipsis functions instead of attempting to call -1(obj) --- src/lib/edje/edje_text.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c index 70392e5..63ca83f 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; --
