diff options
Diffstat (limited to 'src/lib/edje/edje_textblock.c')
| -rw-r--r-- | src/lib/edje/edje_textblock.c | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/src/lib/edje/edje_textblock.c b/src/lib/edje/edje_textblock.c index d331d69b1c..312238735c 100644 --- a/src/lib/edje/edje_textblock.c +++ b/src/lib/edje/edje_textblock.c @@ -44,7 +44,7 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep, tw = th = 0; if (!chosen_desc->text.min_x) { - efl_gfx_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h))); + efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h))); efl_canvas_text_size_formatted_get(ep->object, &tw, &th); } else @@ -70,7 +70,7 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep, tw = th = 0; if (!chosen_desc->text.max_x) { - efl_gfx_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h))); + efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h))); efl_canvas_text_size_formatted_get(ep->object, &tw, &th); } else @@ -144,7 +144,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, * don't get meaningless height for multiline */ if (temp_w > 0) { - efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); + efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); efl_canvas_text_size_formatted_get(ep->object, &tw, &th); tw += ins_l + ins_r; @@ -182,7 +182,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, temp_h = *maxh; } - efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); + efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); efl_canvas_text_size_formatted_get(ep->object, &tw, &th); tw += ins_l + ins_r; @@ -267,7 +267,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, * don't get meaningless height for multiline */ if (temp_w > 0) { - efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); + efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); efl_canvas_text_size_formatted_get(ep->object, &tw, &th); tw += ins_l + ins_r; @@ -325,7 +325,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, /* text.min: 0 0 * text.max: 1 1 */ - efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); + efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); efl_canvas_text_size_formatted_get(ep->object, &tw, &th); tw += ins_l + ins_r; @@ -351,8 +351,8 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, if (min_calc_w > temp_w) temp_w = min_calc_w; - temp_h = efl_gfx_size_get(ep->object).h; - efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); + temp_h = efl_gfx_entity_size_get(ep->object).h; + efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); efl_canvas_text_size_formatted_get(ep->object, &tw, &th); tw += ins_l + ins_r; @@ -438,7 +438,16 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, else { ep->typedata.text->text_source = NULL; - text = edje_string_get(&chosen_desc->text.text); + text = NULL; + if (chosen_desc->text.domain) + { + if (!chosen_desc->text.text.translated) + chosen_desc->text.text.translated = _set_translated_string(ed, ep); + if (chosen_desc->text.text.translated) + text = chosen_desc->text.text.translated; + } + if (!text) + text = edje_string_get(&chosen_desc->text.text); if (ep->typedata.text->text) text = ep->typedata.text->text; } @@ -458,7 +467,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, double s = base_s; if (ep->part->scale) base_s = TO_DOUBLE(sc); - efl_gfx_scale_set(ep->object, base_s); + efl_gfx_entity_scale_set(ep->object, base_s); efl_canvas_text_size_native_get(ep->object, &tw, &th); orig_s = base_s; @@ -467,7 +476,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, { orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, orig_s * TO_INT(params->eval.w) / tw); - efl_gfx_scale_set(ep->object, orig_s); + efl_gfx_entity_scale_set(ep->object, orig_s); efl_canvas_text_size_native_get(ep->object, &tw, &th); } if (chosen_desc->text.fit_x) @@ -476,7 +485,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, { s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, orig_s * TO_INT(params->eval.w) / tw); - efl_gfx_scale_set(ep->object, s); + efl_gfx_entity_scale_set(ep->object, s); efl_canvas_text_size_native_get(ep->object, NULL, NULL); } } @@ -493,7 +502,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, s = tmp_s; } - efl_gfx_scale_set(ep->object, s); + efl_gfx_entity_scale_set(ep->object, s); efl_canvas_text_size_native_get(ep->object, NULL, NULL); } } @@ -518,7 +527,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, break; s = tmp_s; - efl_gfx_scale_set(ep->object, s); + efl_gfx_entity_scale_set(ep->object, s); efl_canvas_text_size_native_get(ep->object, &fw, &fh); i--; } |