aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/edje/edje_text.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/edje/edje_text.c')
-rw-r--r--src/lib/edje/edje_text.c88
1 files changed, 44 insertions, 44 deletions
diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index a49b661c9e..59b20a5d29 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -19,7 +19,7 @@ static inline void
part_get_geometry(Edje_Real_Part *rp, Evas_Coord *w, Evas_Coord *h)
{
if (!rp->part->use_alternate_font_metrics)
- eo_do(rp->object, efl_gfx_size_get(w, h));
+ eo_do(rp->object, efl_gfx_size_get(rp->object, w, h));
else
{
if (w) *w = evas_object_text_horiz_advance_get(rp->object);
@@ -132,10 +132,10 @@ _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,
- evas_obj_text_ellipsis_set(chosen_desc->text.min_x ? -1 : params->type.text.ellipsis),
- efl_text_properties_font_set(font, size),
- efl_text_set(text),
- efl_gfx_size_set(sw, sh));
+ evas_obj_text_ellipsis_set(ep->object, chosen_desc->text.min_x ? -1 : params->type.text.ellipsis),
+ efl_text_properties_font_set(ep->object, font, size),
+ efl_text_set(ep->object, text),
+ efl_gfx_size_set(ep->object, sw, sh));
return text;
}
@@ -323,13 +323,13 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{
eo_do(ep->object,
- if (inlined_font) efl_text_properties_font_source_set(ed->path);
- else efl_text_properties_font_source_set(NULL);
+ if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
+ else efl_text_properties_font_source_set(ep->object, NULL);
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
- efl_text_properties_font_set(font, size);
- efl_text_set(text));
+ efl_text_properties_font_set(ep->object, font, size);
+ efl_text_set(ep->object, text));
part_get_geometry(ep, &tw, &th);
/* Find the wanted font size */
@@ -339,12 +339,12 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
eo_do(ep->object,
- if (inlined_font) efl_text_properties_font_source_set(ed->path);
- else efl_text_properties_font_source_set(NULL);
+ if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
+ else efl_text_properties_font_source_set(ep->object, NULL);
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
- efl_text_properties_font_set(font, size));
+ efl_text_properties_font_set(ep->object, font, size));
part_get_geometry(ep, &tw, &th);
}
@@ -363,13 +363,13 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
eo_do(ep->object,
- if (inlined_font) efl_text_properties_font_source_set(ed->path);
- else efl_text_properties_font_source_set(NULL);
+ if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
+ else efl_text_properties_font_source_set(ep->object, NULL);
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
- efl_text_properties_font_set(font, size);
- efl_text_set(text));
+ efl_text_properties_font_set(ep->object, font, size);
+ efl_text_set(ep->object, text));
part_get_geometry(ep, &tw, &th);
/* only grow the font size if we didn't already reach the max size
@@ -388,11 +388,11 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
eo_do(ep->object,
- if (inlined_font) efl_text_properties_font_source_set(ed->path);
- else efl_text_properties_font_source_set(NULL);
+ if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
+ else efl_text_properties_font_source_set(ep->object, NULL);
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
- efl_text_properties_font_set(font, size));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+ efl_text_properties_font_set(ep->object, font, size));
part_get_geometry(ep, &tw, &th);
if ((size > 0) && (th == 0)) break;
@@ -404,8 +404,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
int current;
eo_do(ep->object,
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
- efl_text_properties_font_set(font, 10));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+ efl_text_properties_font_set(ep->object, font, 10));
part_get_geometry(ep, &tw, &th);
@@ -427,8 +427,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
current = (top + bottom) / 2;
eo_do(ep->object,
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
- efl_text_properties_font_set(font, current));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+ efl_text_properties_font_set(ep->object, font, current));
part_get_geometry(ep, &tw, &th);
@@ -444,8 +444,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
current++;
eo_do(ep->object,
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
- efl_text_properties_font_set(font, current));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+ efl_text_properties_font_set(ep->object, font, current));
part_get_geometry(ep, &tw, &th);
} while (th <= sh);
@@ -466,8 +466,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (!chosen_desc->text.min_x)
{
eo_do (ep->object,
- if (inlined_font) efl_text_properties_font_source_set(ed->path);
- else efl_text_properties_font_source_set(NULL));
+ if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
+ else efl_text_properties_font_source_set(ep->object, NULL));
text = _edje_text_fit_x(ed, ep, params, chosen_desc,
text, font, size,
@@ -509,13 +509,13 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
arrange_text:
eo_do(ep->object,
- if (inlined_font) efl_text_properties_font_source_set(ed->path);
- else efl_text_properties_font_source_set(NULL);
+ if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
+ else efl_text_properties_font_source_set(ep->object, NULL);
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
- efl_text_properties_font_set(font, size);
- efl_text_set(text));
+ efl_text_properties_font_set(ep->object, font, size);
+ efl_text_set(ep->object, text));
part_get_geometry(ep, &tw, &th);
/* Handle alignment */
@@ -544,10 +544,10 @@ arrange_text:
if (!calc_only)
{
eo_do(ep->object,
- efl_gfx_position_set(ed->x + TO_INT(params->eval.x) + ep->typedata.text->offset.x,
+ efl_gfx_position_set(ep->object, ed->x + TO_INT(params->eval.x) + ep->typedata.text->offset.x,
ed->y + TO_INT(params->eval.y) + ep->typedata.text->offset.y);
- efl_gfx_visible_set(params->visible));
+ efl_gfx_visible_set(ep->object, params->visible));
}
{
@@ -608,11 +608,11 @@ arrange_text:
case EDJE_TEXT_EFFECT_OUTLINE_SHADOW:
style = EVAS_TEXT_STYLE_OUTLINE_SHADOW;
eo_do(ep->object,
- evas_obj_text_outline_color_set((params->type.text.color2.r * params->type.text.color2.a) / 255,
+ evas_obj_text_outline_color_set(ep->object, (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.b * params->type.text.color2.a) / 255,
params->type.text.color2.a),
- evas_obj_text_shadow_color_set((params->type.text.color3.r * params->type.text.color3.a) / 255,
+ evas_obj_text_shadow_color_set(ep->object, (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.b * params->type.text.color3.a) / 255,
params->type.text.color3.a));
@@ -621,11 +621,11 @@ arrange_text:
case EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW:
style = EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW;
eo_do(ep->object,
- evas_obj_text_outline_color_set((params->type.text.color2.r * params->type.text.color2.a) / 255,
+ evas_obj_text_outline_color_set(ep->object, (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.b * params->type.text.color2.a) / 255,
params->type.text.color2.a),
- evas_obj_text_shadow_color_set((params->type.text.color3.r * params->type.text.color3.a) / 255,
+ evas_obj_text_shadow_color_set(ep->object, (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.b * params->type.text.color3.a) / 255,
params->type.text.color3.a));
@@ -652,11 +652,11 @@ arrange_text:
case EDJE_TEXT_EFFECT_GLOW:
style = EVAS_TEXT_STYLE_GLOW;
eo_do(ep->object,
- evas_obj_text_glow_color_set((params->type.text.color2.r * params->type.text.color2.a) / 255,
+ evas_obj_text_glow_color_set(ep->object, (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.b * params->type.text.color2.a) / 255,
params->type.text.color2.a),
- evas_obj_text_glow2_color_set((params->type.text.color3.r * params->type.text.color3.a) / 255,
+ evas_obj_text_glow2_color_set(ep->object, (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.b * params->type.text.color3.a) / 255,
params->type.text.color3.a));