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

edje text should actually call ellipsis functions instead of attempting to call -1(obj)

This commit is contained in:
zmike 2014-08-14 14:17:11 -04:00
parent 0823a2159f
commit 0ece308bb1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;