summaryrefslogtreecommitdiff
path: root/src/lib/edje/edje_text.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2014-05-13 16:20:41 -0400
committerMike Blumenkrantz <zmike@samsung.com>2014-05-13 16:20:41 -0400
commit894c36ff112917a9ced45dd947546f63206eeb02 (patch)
treec6b8849dec9790113d5a2b8f2bc0f12827618a2b /src/lib/edje/edje_text.c
parent03edef876f846cd298bd40ad7a21c92d734dd548 (diff)
de-elipsis edje
the word is "ellipsis". it's bad enough that we have released misspelled api, but we can at least spell things correctly internally.
Diffstat (limited to 'src/lib/edje/edje_text.c')
-rw-r--r--src/lib/edje/edje_text.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index ee35101..db98a60 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -91,13 +91,13 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
91 *free_text = 0; 91 *free_text = 0;
92 if (sw <= 1) return ""; 92 if (sw <= 1) return "";
93 93
94 if (params->type.text.elipsis < 0) 94 if (params->type.text.ellipsis < 0)
95 return text; 95 return text;
96 96
97 if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc)); 97 if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
98 98
99 eo_do(ep->object, 99 eo_do(ep->object,
100 evas_obj_text_ellipsis_set(params->type.text.elipsis), 100 evas_obj_text_ellipsis_set(params->type.text.ellipsis),
101 evas_obj_text_font_set(font, size), 101 evas_obj_text_font_set(font, size),
102 evas_obj_text_text_set(text), 102 evas_obj_text_text_set(text),
103 evas_obj_size_set(sw, sh)); 103 evas_obj_size_set(sw, sh));
@@ -273,7 +273,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
273 same_text && 273 same_text &&
274 (ep->typedata.text->cache.align_x == params->type.text.align.x) && 274 (ep->typedata.text->cache.align_x == params->type.text.align.x) &&
275 (ep->typedata.text->cache.align_y == params->type.text.align.y) && 275 (ep->typedata.text->cache.align_y == params->type.text.align.y) &&
276 (ep->typedata.text->cache.elipsis == params->type.text.elipsis) && 276 (ep->typedata.text->cache.ellipsis == params->type.text.ellipsis) &&
277 (ep->typedata.text->cache.fit_x == chosen_desc->text.fit_x) && 277 (ep->typedata.text->cache.fit_x == chosen_desc->text.fit_x) &&
278 (ep->typedata.text->cache.fit_y == chosen_desc->text.fit_y) && 278 (ep->typedata.text->cache.fit_y == chosen_desc->text.fit_y) &&
279 (ep->typedata.text->cache.in_font == font)) 279 (ep->typedata.text->cache.in_font == font))
@@ -439,9 +439,9 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
439 * 22 April 2014 439 * 22 April 2014
440 */ 440 */
441 else if (((ed->file->version >= 3) && (ed->file->minor >= 6)) || 441 else if (((ed->file->version >= 3) && (ed->file->minor >= 6)) ||
442 params->type.text.elipsis) 442 params->type.text.ellipsis)
443 eo_do(ep->object, 443 eo_do(ep->object,
444 evas_obj_text_ellipsis_set(params->type.text.elipsis)); 444 evas_obj_text_ellipsis_set(params->type.text.ellipsis));
445 445
446 eina_stringshare_replace(&ep->typedata.text->cache.out_str, text); 446 eina_stringshare_replace(&ep->typedata.text->cache.out_str, text);
447 ep->typedata.text->cache.in_w = sw; 447 ep->typedata.text->cache.in_w = sw;
@@ -450,7 +450,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
450 ep->typedata.text->cache.out_size = size; 450 ep->typedata.text->cache.out_size = size;
451 ep->typedata.text->cache.align_x = params->type.text.align.x; 451 ep->typedata.text->cache.align_x = params->type.text.align.x;
452 ep->typedata.text->cache.align_y = params->type.text.align.y; 452 ep->typedata.text->cache.align_y = params->type.text.align.y;
453 ep->typedata.text->cache.elipsis = params->type.text.elipsis; 453 ep->typedata.text->cache.ellipsis = params->type.text.ellipsis;
454 ep->typedata.text->cache.fit_x = chosen_desc->text.fit_x; 454 ep->typedata.text->cache.fit_x = chosen_desc->text.fit_x;
455 ep->typedata.text->cache.fit_y = chosen_desc->text.fit_y; 455 ep->typedata.text->cache.fit_y = chosen_desc->text.fit_y;
456arrange_text: 456arrange_text: