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

edje: use more eo_do. 

SVN revision: 80643
This commit is contained in:
Cedric BAIL 2012-12-11 10:50:51 +00:00
parent 8d7f3111c8
commit c0ac1daafd
1 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
legacy/edje/src/lib/edje_text.c
View File

@ -132,11 +132,12 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
if (sw <= 1) return ""; if (sw <= 1) return "";
if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc)); if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
evas_object_text_font_set(ep->object, font, size);
evas_object_text_text_set(ep->object, text);
eo_do(ep->object,
evas_obj_text_font_set(font, size),
evas_obj_text_text_set(text),
evas_obj_text_style_pad_get(&l, &r, NULL, NULL));
part_get_geometry(ep, &tw, &th); part_get_geometry(ep, &tw, &th);
evas_object_text_style_pad_get(ep->object, &l, &r, NULL, NULL);
p = ((sw - tw) * params->type.text.elipsis); p = ((sw - tw) * params->type.text.elipsis);
@ -446,8 +447,9 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
else evas_object_text_font_source_set(ep->object, NULL); else evas_object_text_font_source_set(ep->object, NULL);
if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc)); if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
evas_object_text_font_set(ep->object, font, size); eo_do(ep->object,
evas_object_text_text_set(ep->object, text); evas_obj_text_font_set(font, size),
evas_obj_text_text_set(text));
part_get_geometry(ep, &tw, &th); part_get_geometry(ep, &tw, &th);
/* Find the wanted font size */ /* Find the wanted font size */
if ((tw != sw) && (size > 0) && (tw != 0)) if ((tw != sw) && (size > 0) && (tw != 0))
@ -478,8 +480,9 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
else evas_object_text_font_source_set(ep->object, NULL); else evas_object_text_font_source_set(ep->object, NULL);
if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc)); if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
evas_object_text_font_set(ep->object, font, size); eo_do(ep->object,
evas_object_text_text_set(ep->object, text); evas_obj_text_font_set(font, size),
evas_obj_text_text_set(text));
part_get_geometry(ep, &tw, &th); part_get_geometry(ep, &tw, &th);
/* only grow the font size if we didn't already reach the max size /* only grow the font size if we didn't already reach the max size
@ -584,8 +587,9 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
else evas_object_text_font_source_set(ep->object, NULL); else evas_object_text_font_source_set(ep->object, NULL);
if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc)); if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
evas_object_text_font_set(ep->object, font, size); eo_do(ep->object,
evas_object_text_text_set(ep->object, text); evas_obj_text_font_set(font, size),
evas_obj_text_text_set(text));
part_get_geometry(ep, &tw, &th); part_get_geometry(ep, &tw, &th);
/* Handle alignment */ /* Handle alignment */
{ {
@ -668,29 +672,27 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
break; break;
case EDJE_TEXT_EFFECT_OUTLINE_SHADOW: case EDJE_TEXT_EFFECT_OUTLINE_SHADOW:
style = EVAS_TEXT_STYLE_OUTLINE_SHADOW; style = EVAS_TEXT_STYLE_OUTLINE_SHADOW;
evas_object_text_outline_color_set(ep->object, eo_do(ep->object,
(params->type.text.color2.r * params->type.text.color2.a) / 255, evas_obj_text_outline_color_set((params->type.text.color2.r * params->type.text.color2.a) / 255,
(params->type.text.color2.g * params->type.text.color2.a) / 255, (params->type.text.color2.g * params->type.text.color2.a) / 255,
(params->type.text.color2.b * params->type.text.color2.a) / 255, (params->type.text.color2.b * params->type.text.color2.a) / 255,
params->type.text.color2.a); params->type.text.color2.a),
evas_object_text_shadow_color_set(ep->object, evas_obj_text_shadow_color_set((params->type.text.color3.r * params->type.text.color3.a) / 255,
(params->type.text.color3.r * params->type.text.color3.a) / 255, (params->type.text.color3.g * params->type.text.color3.a) / 255,
(params->type.text.color3.g * params->type.text.color3.a) / 255, (params->type.text.color3.b * params->type.text.color3.a) / 255,
(params->type.text.color3.b * params->type.text.color3.a) / 255, params->type.text.color3.a));
params->type.text.color3.a);
break; break;
case EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW: case EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW:
style = EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW; style = EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW;
evas_object_text_outline_color_set(ep->object, eo_do(ep->object,
(params->type.text.color2.r * params->type.text.color2.a) / 255, evas_obj_text_outline_color_set((params->type.text.color2.r * params->type.text.color2.a) / 255,
(params->type.text.color2.g * params->type.text.color2.a) / 255, (params->type.text.color2.g * params->type.text.color2.a) / 255,
(params->type.text.color2.b * params->type.text.color2.a) / 255, (params->type.text.color2.b * params->type.text.color2.a) / 255,
params->type.text.color2.a); params->type.text.color2.a),
evas_object_text_shadow_color_set(ep->object, evas_obj_text_shadow_color_set((params->type.text.color3.r * params->type.text.color3.a) / 255,
(params->type.text.color3.r * params->type.text.color3.a) / 255, (params->type.text.color3.g * params->type.text.color3.a) / 255,
(params->type.text.color3.g * params->type.text.color3.a) / 255, (params->type.text.color3.b * params->type.text.color3.a) / 255,
(params->type.text.color3.b * params->type.text.color3.a) / 255, params->type.text.color3.a));
params->type.text.color3.a);
break; break;
case EDJE_TEXT_EFFECT_FAR_SHADOW: case EDJE_TEXT_EFFECT_FAR_SHADOW:
style = EVAS_TEXT_STYLE_FAR_SHADOW; style = EVAS_TEXT_STYLE_FAR_SHADOW;
@ -710,16 +712,15 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
break; break;
case EDJE_TEXT_EFFECT_GLOW: case EDJE_TEXT_EFFECT_GLOW:
style = EVAS_TEXT_STYLE_GLOW; style = EVAS_TEXT_STYLE_GLOW;
evas_object_text_glow_color_set(ep->object, eo_do(ep->object,
(params->type.text.color2.r * params->type.text.color2.a) / 255, evas_obj_text_glow_color_set((params->type.text.color2.r * params->type.text.color2.a) / 255,
(params->type.text.color2.g * params->type.text.color2.a) / 255, (params->type.text.color2.g * params->type.text.color2.a) / 255,
(params->type.text.color2.b * params->type.text.color2.a) / 255, (params->type.text.color2.b * params->type.text.color2.a) / 255,
params->type.text.color2.a); params->type.text.color2.a),
evas_object_text_glow2_color_set(ep->object, evas_obj_text_glow2_color_set((params->type.text.color3.r * params->type.text.color3.a) / 255,
(params->type.text.color3.r * params->type.text.color3.a) / 255, (params->type.text.color3.g * params->type.text.color3.a) / 255,
(params->type.text.color3.g * params->type.text.color3.a) / 255, (params->type.text.color3.b * params->type.text.color3.a) / 255,
(params->type.text.color3.b * params->type.text.color3.a) / 255, params->type.text.color3.a));
params->type.text.color3.a);
break; break;
default: default:
style = EVAS_TEXT_STYLE_PLAIN; style = EVAS_TEXT_STYLE_PLAIN;