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

evas_textblock_legacy: change the name of efl_canvas_textblock

This commit is contained in:
WooHyun Jung 2019-09-04 11:10:57 +09:00
parent e3b2d3e62a
commit 6cb887a8ba
19 changed files with 556 additions and 556 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/elementary/test_efl_ui_text.c
View File

@ -103,7 +103,7 @@ _on_bt3_clicked(void *data, const Efl_Event *event EINA_UNUSED)
Eo *en = data;
efl_text_interactive_selection_cursors_get(data, &sel_start, &sel_end);
const char *s = efl_canvas_textblock_range_text_get(data, sel_start, sel_end);
const char *s = evas_textblock_legacy_range_text_get(data, sel_start, sel_end);
printf("SELECTION REGION: %d - %d\n",
efl_text_cursor_position_get(en, sel_start),

2
src/bin/elementary/test_gfx_filters.c
View File

@ -492,7 +492,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
// Experimental textblock support
o = tb = evas_object_textblock_add(evas_object_evas_get(win));
efl_event_callback_add(o, EFL_CANVAS_TEXTBLOCK_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL);
efl_event_callback_add(o, EVAS_TEXTBLOCK_LEGACY_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL);
efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _textblock_resize, NULL);
Evas_Textblock_Style *st = evas_textblock_style_new();
evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'");

2
src/bin/elementary/test_photocam.c
View File

@ -818,7 +818,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
efl_text_set(efl_added, "Clicking the image will play/pause animation."),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_gfx_hint_weight_set(efl_added, 1, 0),
efl_canvas_textblock_style_set(efl_added, NULL, "DEFAULT='align=center font=Sans font_size=10 color=#fff wrap=word'"),
evas_textblock_legacy_style_set(efl_added, NULL, "DEFAULT='align=center font=Sans font_size=10 color=#fff wrap=word'"),
efl_pack(bx, efl_added)
);

40
src/lib/edje/edje_textblock.c
View File

@ -61,7 +61,7 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
if (!minx2)
{
efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th);
evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
}
else
evas_object_textblock_size_native_get(ep->object, &tw, &th);
@ -87,7 +87,7 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
if (!maxx2)
{
efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th);
evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
}
else
evas_object_textblock_size_native_get(ep->object, &tw, &th);
@ -178,14 +178,14 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
if (temp_w > 0)
{
efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th);
evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r;
th += ins_t + ins_b;
}
else
{
efl_canvas_textblock_size_native_get(ep->object, NULL, &th);
evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
th += ins_t + ins_b;
}
@ -216,7 +216,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
}
efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th);
evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r;
th += ins_t + ins_b;
@ -225,7 +225,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_canvas_textblock_size_native_get(ep->object, NULL, &th);
evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
th += ins_t + ins_b;
}
@ -238,7 +238,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
* text.min: 1 X
* text.max: 0 X without max width.
* It is a singleline Textblock. */
efl_canvas_textblock_size_native_get(ep->object, &tw, &th);
evas_textblock_legacy_size_native_get(ep->object, &tw, &th);
tw += ins_l + ins_r;
th += ins_t + ins_b;
@ -301,14 +301,14 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
if (temp_w > 0)
{
efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th);
evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r;
th += ins_t + ins_b;
}
else
{
efl_canvas_textblock_size_native_get(ep->object, NULL, &th);
evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
th += ins_t + ins_b;
}
@ -322,7 +322,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
/* text.min: 1 X
* text.max: 1 X
* Singleline. */
efl_canvas_textblock_size_native_get(ep->object, &tw, &th);
evas_textblock_legacy_size_native_get(ep->object, &tw, &th);
tw += ins_l + ins_r;
th += ins_t + ins_b;
@ -359,7 +359,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
* text.max: 1 1 */
efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th);
evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r;
th += ins_t + ins_b;
@ -368,7 +368,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_canvas_textblock_size_native_get(ep->object, NULL, &th);
evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
th += ins_t + ins_b;
}
@ -386,7 +386,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
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_textblock_size_formatted_get(ep->object, &tw, &th);
evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r;
th += ins_t + ins_b;
@ -395,7 +395,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_canvas_textblock_size_native_get(ep->object, NULL, &th);
evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
th += ins_t + ins_b;
}
@ -509,7 +509,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
if (ep->part->scale) base_s = TO_DOUBLE(sc);
efl_gfx_entity_scale_set(ep->object, base_s);
efl_canvas_textblock_size_native_get(ep->object, &tw, &th);
evas_textblock_legacy_size_native_get(ep->object, &tw, &th);
orig_s = base_s;
/* Now make it bigger so calculations will be more accurate
@ -518,7 +518,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_entity_scale_set(ep->object, orig_s);
efl_canvas_textblock_size_native_get(ep->object, &tw, &th);
evas_textblock_legacy_size_native_get(ep->object, &tw, &th);
}
if (chosen_desc->text.fit_x)
{
@ -527,7 +527,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_entity_scale_set(ep->object, s);
efl_canvas_textblock_size_native_get(ep->object, NULL, NULL);
evas_textblock_legacy_size_native_get(ep->object, NULL, NULL);
}
}
if (chosen_desc->text.fit_y)
@ -544,7 +544,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
}
efl_gfx_entity_scale_set(ep->object, s);
efl_canvas_textblock_size_native_get(ep->object, NULL, NULL);
evas_textblock_legacy_size_native_get(ep->object, NULL, NULL);
}
}
@ -553,7 +553,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
{
int i = 5; /* Tries before we give up. */
Evas_Coord fw, fh;
efl_canvas_textblock_size_native_get(ep->object, &fw, &fh);
evas_textblock_legacy_size_native_get(ep->object, &fw, &fh);
/* If we are still too big, try reducing the size to
* 95% each try. */
@ -569,7 +569,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
s = tmp_s;
efl_gfx_entity_scale_set(ep->object, s);
efl_canvas_textblock_size_native_get(ep->object, &fw, &fh);
evas_textblock_legacy_size_native_get(ep->object, &fw, &fh);
i--;
}
}

26
src/lib/elementary/efl_ui_internal_text_interactive.c
View File

@ -74,7 +74,7 @@ _preedit_del(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
static Eina_Bool
_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos)
{
Efl_Canvas_Textblock *obj = data;
Evas_Textblock_Legacy *obj = data;
Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
const char *str;
@ -103,7 +103,7 @@ _entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSE
static void
_entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
{
Efl_Canvas_Textblock *obj = data;
Evas_Textblock_Legacy *obj = data;
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
char *commit_str = event_info;
@ -176,7 +176,7 @@ _entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void
static void
_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED)
{
Efl_Canvas_Textblock *obj = data;
Evas_Textblock_Legacy *obj = data;
Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
int cursor_pos;
@ -329,7 +329,7 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS
static void
_entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
{
Efl_Canvas_Textblock *obj = data;
Evas_Textblock_Legacy *obj = data;
Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
Ecore_IMF_Event_Delete_Surrounding *ev = event_info;
@ -351,7 +351,7 @@ _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_U
end = evas_textblock_cursor_pos_get(del_end);
if (start == end) goto end;
tmp = efl_canvas_textblock_range_text_get(obj, del_start, del_end);
tmp = evas_textblock_legacy_range_text_get(obj, del_start, del_end);
info.insert = EINA_FALSE;
info.position = start;
@ -373,7 +373,7 @@ end:
static void
_entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
{
Efl_Canvas_Textblock *obj = data;
Evas_Textblock_Legacy *obj = data;
Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
Ecore_IMF_Event_Selection *ev = event_info;
@ -396,7 +396,7 @@ _entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED
static Eina_Bool
_entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text)
{
Efl_Canvas_Textblock *obj = data;
Evas_Textblock_Legacy *obj = data;
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
const char *selection_text = NULL;
@ -500,7 +500,7 @@ static const char *
_entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
{
if ((!en->selection) && (en->have_selection))
en->selection = efl_canvas_textblock_range_text_get(obj, en->sel_start, en->sel_end);
en->selection = evas_textblock_legacy_range_text_get(obj, en->sel_start, en->sel_end);
return en->selection;
}
@ -601,7 +601,7 @@ _range_del_emit(Evas_Object *obj, Efl_Text_Cursor_Cursor *cur1, Efl_Text_Cursor_
info.position = start;
info.length = end - start;
tmp = efl_canvas_textblock_range_text_get(obj, cur1, cur2);
tmp = evas_textblock_legacy_range_text_get(obj, cur1, cur2);
info.content = tmp;
evas_textblock_cursor_range_delete(cur1, cur2);
@ -752,7 +752,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
{
if (multiline)
{
if (shift || efl_canvas_textblock_legacy_newline_get(obj))
if (shift || evas_textblock_legacy_newline_get(obj))
{
string = "\n";
}
@ -1070,7 +1070,7 @@ end:
}
static void
_cursor_char_coord_set(Efl_Canvas_Textblock *obj, Efl_Text_Cursor_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy)
_cursor_char_coord_set(Evas_Textblock_Legacy *obj, Efl_Text_Cursor_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy)
{
Evas_Coord cx, cy;
Evas_Coord x, y, lh = 0, cly = 0;
@ -1337,9 +1337,9 @@ _efl_ui_internal_text_interactive_efl_object_finalize(Eo *obj, Efl_Ui_Internal_T
en->sel_start = evas_object_textblock_cursor_new(obj);
en->sel_end = evas_object_textblock_cursor_new(obj);
efl_event_callback_add(obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED,
efl_event_callback_add(obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED,
_sel_cursor_changed, obj);
efl_event_callback_add(obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED,
efl_event_callback_add(obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED,
_sel_cursor_changed, obj);
en->input_panel_enable = EINA_TRUE;

2
src/lib/elementary/efl_ui_internal_text_interactive.eo
View File

@ -1,4 +1,4 @@
class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Textblock implements Efl.Text_Interactive
class @beta Efl.Ui.Internal.Text.Interactive extends Evas.Textblock.Legacy implements Efl.Text_Interactive
{
[[An internal object in charge of the interactive aspect of the text widget.

6
src/lib/elementary/efl_ui_internal_text_scroller.c
View File

@ -28,7 +28,7 @@
typedef struct _Efl_Ui_Internal_Text_Scroller_Data
{
Efl_Canvas_Textblock *text_obj;
Evas_Textblock_Legacy *text_obj;
Efl_Ui_Table *text_table;
Eo *smanager;
@ -93,7 +93,7 @@ _efl_ui_internal_text_scroller_efl_canvas_group_group_calculate(Eo *obj,
efl_event_freeze(sd->text_obj);
efl_gfx_entity_size_set(sd->text_table, view.size);
efl_gfx_entity_size_set(sd->text_obj, view.size);
efl_canvas_textblock_size_formatted_get(sd->text_obj, &fsz.w, &fsz.h);
evas_textblock_legacy_size_formatted_get(sd->text_obj, &fsz.w, &fsz.h);
efl_gfx_entity_size_set(sd->text_table, sz);
efl_gfx_entity_size_set(sd->text_obj, sz);
efl_event_thaw(sd->text_obj);
@ -144,7 +144,7 @@ _efl_ui_internal_text_scroller_efl_object_destructor(Eo *obj,
EOLIAN static void
_efl_ui_internal_text_scroller_initialize(Eo *obj,
Efl_Ui_Internal_Text_Scroller_Data *sd,
Efl_Canvas_Textblock *text_obj,
Evas_Textblock_Legacy *text_obj,
Efl_Ui_Table *text_table)
{
if (efl_finalized_get(obj))

2
src/lib/elementary/efl_ui_internal_text_scroller.eo
View File

@ -38,7 +38,7 @@ class @beta Efl.Ui.Internal_Text_Scroller extends Efl.Ui.Scroller
This should be called upon constructing the object.
]]
params {
text_obj: Efl.Canvas.Textblock; [[The text object to query]]
text_obj: Evas.Textblock.Legacy; [[The text object to query]]
text_table: Efl.Ui.Table; [[The table container of
the $text_obj]]
}

24
src/lib/elementary/efl_ui_text.c
View File

@ -610,7 +610,7 @@ _selection_data_cb(void *data EINA_UNUSED, Eo *obj,
efl_text_interactive_selection_cursors_get(obj, &start, &end);
if (!efl_text_cursor_equal(obj, start, end))
{
efl_canvas_textblock_range_delete(obj, start, end);
evas_textblock_legacy_range_delete(obj, start, end);
}
cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
info.insert = EINA_TRUE;
@ -917,9 +917,9 @@ _efl_ui_text_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Text_Data *sd)
efl_gfx_entity_size_set(sd->text_obj, EINA_SIZE2D(sz.w, 0));
/* ignore current object size for single-line since we always need to know the actual size */
if (sd->single_line)
efl_canvas_textblock_size_native_get(sd->text_obj, &min.w, &min.h);
evas_textblock_legacy_size_native_get(sd->text_obj, &min.w, &min.h);
else
efl_canvas_textblock_size_formatted_get(sd->text_obj, &min.w, &min.h);
evas_textblock_legacy_size_formatted_get(sd->text_obj, &min.w, &min.h);
efl_gfx_entity_size_set(sd->text_obj, text_sz);
efl_event_thaw(sd->text_obj);
min.w += edmin.w;
@ -937,7 +937,7 @@ _return_key_enabled_check(Evas_Object *obj)
if (!sd->auto_return_key) return;
if (efl_canvas_textblock_is_empty_get(obj) == EINA_TRUE)
if (evas_textblock_legacy_is_empty_get(obj) == EINA_TRUE)
return_key_disabled = EINA_TRUE;
efl_ui_text_input_panel_return_key_disabled_set(obj, return_key_disabled);
@ -1243,7 +1243,7 @@ _cut_cb(Eo *obj)
_selection_store(EFL_UI_SELECTION_TYPE_CLIPBOARD, obj);
efl_text_interactive_selection_cursors_get(obj, &start, &end);
efl_canvas_textblock_range_delete(obj, start, end);
evas_textblock_legacy_range_delete(obj, start, end);
_efl_ui_text_select_none(obj, sd);
}
@ -2126,7 +2126,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd)
efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED, obj);
efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED, obj);
sd->text_obj = text_obj;
sd->text_guide_obj = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, obj);
sd->text_guide_obj = efl_add(EVAS_TEXTBLOCK_LEGACY_CLASS, obj);
sd->text_table = efl_add(EFL_UI_TABLE_CLASS, obj);
efl_composite_attach(obj, text_obj);
@ -2190,11 +2190,11 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
(sd->entry_edje, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_event_callback_add(sd->text_obj, EFL_UI_TEXT_EVENT_CHANGED_USER,
_efl_ui_text_changed_user_cb, obj);
efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED,
efl_event_callback_add(sd->text_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED,
_efl_ui_text_changed_cb, obj);
efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED,
_efl_ui_text_selection_changed_cb, obj);
efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED,
efl_event_callback_add(sd->text_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED,
_efl_ui_text_cursor_changed_cb, obj);
efl_event_callback_add(sd->text_obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED,
_text_position_changed_cb, obj);
@ -2357,7 +2357,7 @@ _efl_ui_text_selection_get(const Eo *obj, Efl_Ui_Text_Data *sd)
if ((sd->password)) return NULL;
efl_text_interactive_selection_cursors_get(obj, &start_obj, &end_obj);
return efl_canvas_textblock_range_text_get(obj, start_obj, end_obj);
return evas_textblock_legacy_range_text_get(obj, start_obj, end_obj);
}
EOLIAN static void
@ -3535,7 +3535,7 @@ _update_text_selection(Eo *obj, Eo *text_obj)
efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end);
range = efl_canvas_textblock_range_simple_geometry_get(text_obj,
range = evas_textblock_legacy_range_simple_geometry_get(text_obj,
sel_start, sel_end);
l = sd->sel;
@ -3765,7 +3765,7 @@ _anchors_update(Eo *obj, Efl_Ui_Text_Data *sd)
efl_text_annotation_positions_get(obj, anc->annotation,
start, end);
range = efl_canvas_textblock_range_geometry_get(obj, start, end);
range = evas_textblock_legacy_range_geometry_get(obj, start, end);
count = eina_list_count(eina_iterator_container_get(range));
// Add additional rectangles if needed
@ -3979,7 +3979,7 @@ _efl_ui_text_selection_changed_cb(void *data, const Efl_Event *event EINA_UNUSED
efl_text_interactive_selection_cursors_get(obj, &start, &end);
text = efl_canvas_textblock_range_text_get(obj, start, end);
text = evas_textblock_legacy_range_text_get(obj, start, end);
if (!text || (text[0] == '\0'))
{
_edje_signal_emit(sd, "selection,cleared", "efl.text");

4
src/lib/evas/Evas_Eo.h
View File

@ -150,12 +150,12 @@ struct _Efl_Canvas_Object_Animation_Event
*/
/**
* @ingroup Efl_Canvas_Textblock
* @ingroup Evas_Textblock_Legacy
*
* @{
*/
//#include "canvas/efl_canvas_text_cursor.eo.h"
#include "canvas/efl_canvas_textblock.eo.h"
#include "canvas/evas_textblock_legacy.eo.h"
#include "canvas/efl_canvas_text_factory.eo.h"
/**
* @}

66
src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c
View File

@ -1,66 +0,0 @@
EAPI Eina_Bool
evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj, Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end)
{
return efl_canvas_textblock_visible_range_get(obj, start, end);
}
EAPI void
evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj, int *l, int *r, int *t, int *b)
{
efl_canvas_textblock_style_insets_get(obj, l, r, t, b);
}
EAPI void
evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, const char *delim)
{
efl_canvas_textblock_bidi_delimiters_set(obj, delim);
}
EAPI const char *
evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Textblock *obj)
{
return efl_canvas_textblock_bidi_delimiters_get(obj);
}
EAPI void
evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Eina_Bool mode)
{
efl_canvas_textblock_legacy_newline_set(obj, mode);
}
EAPI Eina_Bool
evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblock *obj)
{
return efl_canvas_textblock_legacy_newline_get(obj);
}
EAPI void
evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *w, int *h)
{
efl_canvas_textblock_size_formatted_get(obj, w, h);
}
EAPI void
evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *w, int *h)
{
efl_canvas_textblock_size_native_get(obj, w, h);
}
EAPI Eina_Bool
evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs)
{
return efl_canvas_textblock_obstacle_add(obj, eo_obs);
}
EAPI Eina_Bool
evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs)
{
return efl_canvas_textblock_obstacle_del(obj, eo_obs);
}
EAPI void
evas_object_textblock_obstacles_update(Efl_Canvas_Textblock *obj)
{
efl_canvas_textblock_obstacles_update(obj);
}

752
src/lib/evas/canvas/evas_object_textblock.c
View File

File diff suppressed because it is too large Load Diff

4
src/lib/evas/canvas/evas_textblock_hyphenation.x
View File

@ -17,7 +17,7 @@ static size_t _hyphen_clients = 0;
static void
_dicts_hyphen_init(Eo *eo_obj)
{
Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
if (!o->hyphenating)
{
@ -98,7 +98,7 @@ _dicts_hyphen_free(void)
static inline void
_dicts_hyphen_detach(Eo *eo_obj)
{
Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
if (!o->hyphenating) return;
o->hyphenating = EINA_FALSE;

2
src/lib/evas/canvas/efl_canvas_textblock.eo → src/lib/evas/canvas/evas_textblock_legacy.eo
View File

@ -1,6 +1,6 @@
import efl_text_types;
class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
class @beta Evas.Textblock.Legacy extends Efl.Canvas.Object implements Efl.Text,
Efl.Canvas.Filter.Internal, Efl.Text_Font,
Efl.Text_Style, Efl.Text_Format, Efl.Text_Cursor,
Efl.Text_Annotate, Efl.Text_Markup, Efl.Text_Markup_Interactive, Efl.Ui.I18n

12
src/lib/evas/canvas/evas_textblock_legacy.h
View File

@ -138,7 +138,7 @@ typedef Eo Evas_Textblock;
* @see evas_textblock_style_set()
*/
typedef struct _Efl_Canvas_Textblock_Style Evas_Textblock_Style;
typedef struct _Evas_Textblock_Legacy_Style Evas_Textblock_Style;
/**
* @typedef Evas_Textblock_Cursor
@ -921,7 +921,7 @@ EAPI int evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const ch
*
* @param[in] ch The charset name.
*
* @ingroup Efl_Canvas_Textblock
* @ingroup Evas_Textblock_Legacy
*/
EAPI void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *ch);
@ -930,7 +930,7 @@ EAPI void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *c
*
* @return The charset name.
*
* @ingroup Efl_Canvas_Textblock
* @ingroup Evas_Textblock_Legacy
*/
EAPI const char *evas_object_textblock_replace_char_get(const Evas_Object *obj);
@ -945,7 +945,7 @@ EAPI const char *evas_object_textblock_replace_char_get(const Evas_Object *obj);
*
* @since 1.1
*
* @ingroup Efl_Canvas_Textblock
* @ingroup Evas_Textblock_Legacy
*/
EAPI void evas_object_textblock_valign_set(Evas_Object *obj, double align);
@ -960,7 +960,7 @@ EAPI void evas_object_textblock_valign_set(Evas_Object *obj, double align);
*
* @since 1.1
*
* @ingroup Efl_Canvas_Textblock
* @ingroup Evas_Textblock_Legacy
*/
EAPI double evas_object_textblock_valign_get(const Evas_Object *obj);
@ -1056,7 +1056,7 @@ EAPI void evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur);
* @ingroup Evas_Textblock
*/
EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_get(const Evas_Object *obj);
#include "canvas/efl_canvas_textblock_eo.legacy.h"
#include "canvas/evas_textblock_legacy_eo.h"
/**
* @}
*/

66
src/lib/evas/canvas/evas_textblock_legacy_eo.c Normal file
View File

@ -0,0 +1,66 @@
EAPI Eina_Bool
evas_object_textblock_visible_range_get(Evas_Textblock_Legacy *obj, Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end)
{
return evas_textblock_legacy_visible_range_get(obj, start, end);
}
EAPI void
evas_object_textblock_style_insets_get(const Evas_Textblock_Legacy *obj, int *l, int *r, int *t, int *b)
{
evas_textblock_legacy_style_insets_get(obj, l, r, t, b);
}
EAPI void
evas_object_textblock_bidi_delimiters_set(Evas_Textblock_Legacy *obj, const char *delim)
{
evas_textblock_legacy_bidi_delimiters_set(obj, delim);
}
EAPI const char *
evas_object_textblock_bidi_delimiters_get(const Evas_Textblock_Legacy *obj)
{
return evas_textblock_legacy_bidi_delimiters_get(obj);
}
EAPI void
evas_object_textblock_legacy_newline_set(Evas_Textblock_Legacy *obj, Eina_Bool mode)
{
evas_textblock_legacy_newline_set(obj, mode);
}
EAPI Eina_Bool
evas_object_textblock_legacy_newline_get(const Evas_Textblock_Legacy *obj)
{
return evas_textblock_legacy_newline_get(obj);
}
EAPI void
evas_object_textblock_size_formatted_get(const Evas_Textblock_Legacy *obj, int *w, int *h)
{
evas_textblock_legacy_size_formatted_get(obj, w, h);
}
EAPI void
evas_object_textblock_size_native_get(const Evas_Textblock_Legacy *obj, int *w, int *h)
{
evas_textblock_legacy_size_native_get(obj, w, h);
}
EAPI Eina_Bool
evas_object_textblock_obstacle_add(Evas_Textblock_Legacy *obj, Efl_Canvas_Object *eo_obs)
{
return evas_textblock_legacy_obstacle_add(obj, eo_obs);
}
EAPI Eina_Bool
evas_object_textblock_obstacle_del(Evas_Textblock_Legacy *obj, Efl_Canvas_Object *eo_obs)
{
return evas_textblock_legacy_obstacle_del(obj, eo_obs);
}
EAPI void
evas_object_textblock_obstacles_update(Evas_Textblock_Legacy *obj)
{
evas_textblock_legacy_obstacles_update(obj);
}

36
src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.h → src/lib/evas/canvas/evas_textblock_legacy_eo.h
View File

@ -1,15 +1,15 @@
#ifndef _EFL_CANVAS_TEXTBLOCK_EO_LEGACY_H_
#define _EFL_CANVAS_TEXTBLOCK_EO_LEGACY_H_
#ifndef _EVAS_TEXTBLOCK_LEGACY_EO_LEGACY_H_
#define _EVAS_TEXTBLOCK_LEGACY_EO_LEGACY_H_
#ifndef _EFL_CANVAS_TEXTBLOCK_EO_CLASS_TYPE
#define _EFL_CANVAS_TEXTBLOCK_EO_CLASS_TYPE
#ifndef _EVAS_TEXTBLOCK_LEGACY_EO_CLASS_TYPE
#define _EVAS_TEXTBLOCK_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Canvas_Textblock;
typedef Eo Evas_Textblock_Legacy;
#endif
#ifndef _EFL_CANVAS_TEXTBLOCK_EO_TYPES
#define _EFL_CANVAS_TEXTBLOCK_EO_TYPES
#ifndef _EVAS_TEXTBLOCK_LEGACY_EO_TYPES
#define _EVAS_TEXTBLOCK_LEGACY_EO_TYPES
#endif
@ -32,7 +32,7 @@ typedef Eo Efl_Canvas_Textblock;
*
* @ingroup Evas_Object_Textblock_Group
*/
EAPI Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj, Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end);
EAPI Eina_Bool evas_object_textblock_visible_range_get(Evas_Textblock_Legacy *obj, Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end);
/**
* @brief Gets the left, right, top and bottom insets of the text.
@ -49,7 +49,7 @@ EAPI Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj
*
* @ingroup Evas_Object_Textblock_Group
*/
EAPI void evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj, int *left, int *right, int *top, int *bottom);
EAPI void evas_object_textblock_style_insets_get(const Evas_Textblock_Legacy *obj, int *left, int *right, int *top, int *bottom);
/**
* @brief BiDi delimiters are used for in-paragraph separation of bidi
@ -64,7 +64,7 @@ EAPI void evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj
*
* @ingroup Evas_Object_Textblock_Group
*/
EAPI void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, const char *delim);
EAPI void evas_object_textblock_bidi_delimiters_set(Evas_Textblock_Legacy *obj, const char *delim);
/**
* @brief BiDi delimiters are used for in-paragraph separation of bidi
@ -79,7 +79,7 @@ EAPI void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, c
*
* @ingroup Evas_Object_Textblock_Group
*/
EAPI const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Textblock *obj);
EAPI const char *evas_object_textblock_bidi_delimiters_get(const Evas_Textblock_Legacy *obj);
/**
* @brief When @c true, newline character will behave as a paragraph separator.
@ -91,7 +91,7 @@ EAPI const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Text
*
* @ingroup Evas_Object_Textblock_Group
*/
EAPI void evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Eina_Bool mode);
EAPI void evas_object_textblock_legacy_newline_set(Evas_Textblock_Legacy *obj, Eina_Bool mode);
/**
* @brief When @c true, newline character will behave as a paragraph separator.
@ -104,7 +104,7 @@ EAPI void evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Ei
*
* @ingroup Evas_Object_Textblock_Group
*/
EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblock *obj);
EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Evas_Textblock_Legacy *obj);
@ -133,7 +133,7 @@ EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblo
*
* @ingroup Evas_Object_Textblock_Group
*/
EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *width, int *height);
EAPI void evas_object_textblock_size_formatted_get(const Evas_Textblock_Legacy *obj, int *width, int *height);
/**
* @brief The native width and height.
@ -161,7 +161,7 @@ EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *o
*
* @ingroup Evas_Object_Textblock_Group
*/
EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *width, int *height);
EAPI void evas_object_textblock_size_native_get(const Evas_Textblock_Legacy *obj, int *width, int *height);
@ -183,7 +183,7 @@ EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj,
*
* @ingroup Evas_Object_Textblock_Group
*/
EAPI Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs);
EAPI Eina_Bool evas_object_textblock_obstacle_add(Evas_Textblock_Legacy *obj, Efl_Canvas_Object *eo_obs);
/**
* @brief Removes @c eo_obs from observation during text layout.
@ -197,7 +197,7 @@ EAPI Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl
*
* @ingroup Evas_Object_Textblock_Group
*/
EAPI Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs);
EAPI Eina_Bool evas_object_textblock_obstacle_del(Evas_Textblock_Legacy *obj, Efl_Canvas_Object *eo_obs);
/**
* @brief Triggers for relayout due to obstacles' state change.
@ -216,7 +216,7 @@ EAPI Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl
*
* @ingroup Evas_Object_Textblock_Group
*/
EAPI void evas_object_textblock_obstacles_update(Efl_Canvas_Textblock *obj);
EAPI void evas_object_textblock_obstacles_update(Evas_Textblock_Legacy *obj);
#endif

4
src/lib/evas/canvas/meson.build
View File

@ -51,7 +51,7 @@ pub_eo_files = [
'efl_canvas_group.eo',
'efl_gfx_mapping.eo',
'efl_canvas_event_grabber.eo',
'efl_canvas_textblock.eo'
'evas_textblock_legacy.eo'
]
evas_canvas_eo_files = pub_eo_files
@ -99,7 +99,7 @@ evas_legacy_h = files([
'efl_canvas_event_grabber_eo.legacy.h',
'efl_canvas_group_eo.legacy.h',
'efl_canvas_object_eo.legacy.h',
'efl_canvas_textblock_eo.legacy.h',
'evas_textblock_legacy_eo.h',
'efl_canvas_vg_container_eo.legacy.h',
'efl_canvas_vg_node_eo.legacy.h',
'efl_canvas_vg_object_eo.legacy.h',

60
src/tests/evas/evas_test_textblock.c
View File

@ -4530,18 +4530,18 @@ EFL_START_TEST(evas_textblock_annotation)
}
EFL_END_TEST;
#define START_EFL_CANVAS_TEXTBLOCK_TEST() \
#define START_EVAS_TEXTBLOCK_LEGACY_TEST() \
Evas *evas; \
Eo *txt; \
Efl_Text_Cursor_Cursor *cur; \
evas = EVAS_TEST_INIT_EVAS(); \
evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO); \
txt = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, evas); \
txt = efl_add(EVAS_TEXTBLOCK_LEGACY_CLASS, evas); \
fail_if(!txt); \
efl_canvas_textblock_legacy_newline_set(txt, EINA_FALSE); \
efl_canvas_textblock_style_set(txt, NULL, style_buf); \
fail_if(!efl_canvas_textblock_style_get(txt, NULL) || \
strcmp(style_buf, efl_canvas_textblock_style_get(txt, NULL))); \
evas_textblock_legacy_newline_set(txt, EINA_FALSE); \
evas_textblock_legacy_style_set(txt, NULL, style_buf); \
fail_if(!evas_textblock_legacy_style_get(txt, NULL) || \
strcmp(style_buf, evas_textblock_legacy_style_get(txt, NULL))); \
cur = efl_text_cursor_new(txt); \
fail_if(!cur); \
do \
@ -4549,7 +4549,7 @@ do \
} \
while (0)
#define END_EFL_CANVAS_TEXTBLOCK_TEST() \
#define END_EVAS_TEXTBLOCK_LEGACY_TEST() \
do \
{ \
efl_text_cursor_free(txt, cur); \
@ -4558,17 +4558,17 @@ do \
} \
while (0)
EFL_START_TEST(efl_canvas_textblock_simple)
EFL_START_TEST(evas_textblock_legacy_simple)
{
START_EFL_CANVAS_TEXTBLOCK_TEST();
START_EVAS_TEXTBLOCK_LEGACY_TEST();
/* It is simple test for Efl_Canvas_Textblock.
/* It is simple test for Evas_Textblock_Legacy.
* The main object is "txt". */
const char *buf = "Th<i>i</i>s is a <br/> te<b>s</b>t.";
efl_text_set(txt, buf);
fail_if(strcmp(efl_text_get(txt), buf));
END_EFL_CANVAS_TEXTBLOCK_TEST();
END_EVAS_TEXTBLOCK_LEGACY_TEST();
}
EFL_END_TEST
@ -4585,7 +4585,7 @@ EFL_START_TEST(efl_text)
* Russian 't' in the beginnning to create additional item.*/
/*01234 5 6789012345678 19 01234 */
efl_text_set(tb, "тest \u202bנסיוןabcנסיון\u202c bang");
efl_canvas_textblock_size_native_get(tb, &nw, &nh);
evas_textblock_legacy_size_native_get(tb, &nw, &nh);
efl_gfx_entity_size_set(tb, EINA_SIZE2D(nw, nh));
/* Logical cursor after "test " */
@ -4605,9 +4605,9 @@ EFL_START_TEST(efl_text)
}
EFL_END_TEST
EFL_START_TEST(efl_canvas_textblock_cursor)
EFL_START_TEST(evas_textblock_legacy_cursor)
{
START_EFL_CANVAS_TEXTBLOCK_TEST();
START_EVAS_TEXTBLOCK_LEGACY_TEST();
int pos;
const char *buf = "abcdefghij";
@ -4621,14 +4621,14 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
pos = efl_text_cursor_position_get(txt, cur);
ck_assert_int_eq(pos, 10);
END_EFL_CANVAS_TEXTBLOCK_TEST();
END_EVAS_TEXTBLOCK_LEGACY_TEST();
}
EFL_END_TEST
EFL_START_TEST(efl_canvas_textblock_markup)
EFL_START_TEST(evas_textblock_legacy_markup)
{
START_EFL_CANVAS_TEXTBLOCK_TEST();
START_EVAS_TEXTBLOCK_LEGACY_TEST();
Efl_Text_Cursor_Cursor *start, *end;
char *res;
@ -4650,13 +4650,13 @@ EFL_START_TEST(efl_canvas_textblock_markup)
ck_assert_str_eq(res, "bc<br>");
free(res);
END_EFL_CANVAS_TEXTBLOCK_TEST();
END_EVAS_TEXTBLOCK_LEGACY_TEST();
}
EFL_END_TEST
EFL_START_TEST(efl_canvas_textblock_markup_invalid_escape)
EFL_START_TEST(evas_textblock_legacy_markup_invalid_escape)
{
START_EFL_CANVAS_TEXTBLOCK_TEST();
START_EVAS_TEXTBLOCK_LEGACY_TEST();
char * text1 = "Hello";
char * text2 = "Hello&123";
@ -4664,22 +4664,22 @@ EFL_START_TEST(efl_canvas_textblock_markup_invalid_escape)
Evas_Coord fw1, fw2, fw3;
efl_text_markup_set(txt,text1);
efl_canvas_textblock_size_native_get(txt, &fw1, NULL);
evas_textblock_legacy_size_native_get(txt, &fw1, NULL);
efl_text_markup_set(txt,text2);
efl_canvas_textblock_size_native_get(txt, &fw2, NULL);
evas_textblock_legacy_size_native_get(txt, &fw2, NULL);
fail_if(fw2 <= fw1);
efl_text_markup_set(txt,text3);
efl_canvas_textblock_size_native_get(txt, &fw3, NULL);
evas_textblock_legacy_size_native_get(txt, &fw3, NULL);
fail_if(fw3 <= fw2);
END_EFL_CANVAS_TEXTBLOCK_TEST();
END_EVAS_TEXTBLOCK_LEGACY_TEST();
}
EFL_END_TEST
EFL_START_TEST(efl_text_font)
{
START_EFL_CANVAS_TEXTBLOCK_TEST();
START_EVAS_TEXTBLOCK_LEGACY_TEST();
efl_text_set(txt, "\n\n\n");
@ -4702,7 +4702,7 @@ EFL_START_TEST(efl_text_font)
fail_if(30 != font_size);
fail_if(strcmp(font,"arial"));
END_EFL_CANVAS_TEXTBLOCK_TEST();
END_EVAS_TEXTBLOCK_LEGACY_TEST();
}
EFL_END_TEST
@ -4734,11 +4734,11 @@ void evas_test_textblock(TCase *tc)
#endif
tcase_add_test(tc, evas_textblock_text_iface);
tcase_add_test(tc, evas_textblock_annotation);
tcase_add_test(tc, efl_canvas_textblock_simple);
tcase_add_test(tc, evas_textblock_legacy_simple);
tcase_add_test(tc, efl_text);
tcase_add_test(tc, efl_canvas_textblock_cursor);
tcase_add_test(tc, efl_canvas_textblock_markup);
tcase_add_test(tc, efl_canvas_textblock_markup_invalid_escape);
tcase_add_test(tc, evas_textblock_legacy_cursor);
tcase_add_test(tc, evas_textblock_legacy_markup);
tcase_add_test(tc, evas_textblock_legacy_markup_invalid_escape);
tcase_add_test(tc, efl_text_font);
}