cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6b5ac687c1a36569af9804f5e545b197d3892040
commit 6b5ac687c1a36569af9804f5e545b197d3892040
Author: Xavi Artigas <xavierarti...@yahoo.es>
Date: Fri Apr 6 13:30:40 2018 +0200
Efl.Text_* (from Efl.Text.*)
Including:
Efl.Text.Cursor_* (from Efl.Text.Cursor.Cursor_*)
Efl.Text.Font_* (from Efl.Text.Font.*)
Efl.Text.Format_* (from Efl.Text.Format.*)
Efl.Text.Style_* (from Efl.Text.Style.*)
Efl.Ui.Text_* (from Efl.Ui.Text.*)
Ref https://phab.enlightenment.org/T6847
Reviewed-by: Cedric Bail <ced...@osg.samsung.com>
---
src/Makefile_Elementary.am | 2 +-
src/bin/elementary/test_efl_ui_text.c | 12 +-
src/bin/elementary/test_gfx_filters.c | 2 +-
src/bin/elementary/test_part_bg.c | 2 +-
src/bin/elementary/test_photocam.c | 2 +-
src/lib/edje/edje_part_invalid.c | 4 +-
src/lib/edje/edje_part_text.c | 12 +-
src/lib/edje/edje_private.h | 4 +-
src/lib/edje/edje_util.c | 8 +-
src/lib/edje/efl_canvas_layout_part_invalid.eo | 32 ++--
src/lib/edje/efl_canvas_layout_part_text.eo | 32 ++--
src/lib/efl/interfaces/efl_text_annotate.eo | 36 ++---
src/lib/efl/interfaces/efl_text_cursor.eo | 66 ++++----
src/lib/efl/interfaces/efl_text_font.eo | 26 +--
src/lib/efl/interfaces/efl_text_format.eo | 10 +-
src/lib/efl/interfaces/efl_text_markup.eo | 4 +-
src/lib/efl/interfaces/efl_text_markup_util.eo | 2 +-
src/lib/efl/interfaces/efl_text_style.eo | 24 +--
src/lib/efl/interfaces/efl_text_types.eot | 4 +-
src/lib/elementary/Elementary.h | 2 +-
...text_interactive.eo => efl_text_interactive.eo} | 8 +-
src/lib/elementary/efl_ui_button.eo | 2 +-
src/lib/elementary/efl_ui_frame.eo | 4 +-
.../elementary/efl_ui_internal_text_interactive.c | 14 +-
.../elementary/efl_ui_internal_text_interactive.eo | 8 +-
src/lib/elementary/efl_ui_layout.c | 8 +-
src/lib/elementary/efl_ui_layout_part_legacy.eo | 4 +-
src/lib/elementary/efl_ui_layout_part_text.eo | 4 +-
src/lib/elementary/efl_ui_progressbar.eo | 4 +-
src/lib/elementary/efl_ui_slider.eo | 4 +-
src/lib/elementary/efl_ui_text.c | 36 ++---
src/lib/elementary/efl_ui_text.eo | 6 +-
src/lib/elementary/efl_ui_text_editable.eo | 2 +-
.../elementary/efl_ui_text_factory_emoticons.eo | 2 +-
src/lib/elementary/efl_ui_text_factory_fallback.eo | 2 +-
src/lib/elementary/efl_ui_text_factory_images.eo | 2 +-
src/lib/elementary/elm_part_helper.h | 8 +-
src/lib/evas/canvas/efl_canvas_text.eo | 176 ++++++++++-----------
src/lib/evas/canvas/evas_object_textblock.c | 4 +-
src/lib/evas/canvas/evas_text.eo | 8 +-
src/lib/evas/canvas/evas_textgrid.eo | 10 +-
41 files changed, 301 insertions(+), 301 deletions(-)
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 9dfd2f561c..8dd4d2d860 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -36,7 +36,7 @@ elm_public_eolian_files = \
lib/elementary/efl_ui_box_stack.eo \
lib/elementary/efl_ui_table.eo \
lib/elementary/efl_ui_table_static.eo \
- lib/elementary/efl_ui_text_interactive.eo \
+ lib/elementary/efl_text_interactive.eo \
lib/elementary/efl_ui_text.eo \
lib/elementary/efl_ui_popup.eo \
lib/elementary/efl_ui_popup_part.eo \
diff --git a/src/bin/elementary/test_efl_ui_text.c
b/src/bin/elementary/test_efl_ui_text.c
index ae9cf4e9f3..9ad0e9a50a 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -29,7 +29,7 @@ _create_label(Eo *win, Eo *bx)
Eo *en;
en = efl_add(EFL_UI_TEXT_CLASS, win);
printf("Added Efl.Ui.Text object\n");
- efl_ui_text_interactive_editable_set(en, EINA_FALSE);
+ efl_text_interactive_editable_set(en, EINA_FALSE);
elm_box_pack_end(bx, en);
return en;
}
@@ -72,7 +72,7 @@ test_efl_ui_text_label(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, voi
en = _create_label(win, bx);
efl_text_set(en, "You can input text here.");
efl_text_font_set(en, "Sans", 14);
- efl_ui_text_interactive_editable_set(en, EINA_TRUE);
+ efl_text_interactive_editable_set(en, EINA_TRUE);
efl_text_wrap_set(en, EFL_TEXT_FORMAT_WRAP_WORD);
efl_ui_text_scrollable_set(en, EINA_TRUE);
evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.5);
@@ -80,7 +80,7 @@ test_efl_ui_text_label(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, voi
en = _create_label(win, bx);
efl_text_set(en, "Input multiline here.");
efl_text_font_set(en, "Sans", 14);
- efl_ui_text_interactive_editable_set(en, EINA_TRUE);
+ efl_text_interactive_editable_set(en, EINA_TRUE);
efl_text_wrap_set(en, EFL_TEXT_FORMAT_WRAP_WORD);
efl_text_multiline_set(en, EINA_TRUE);
efl_ui_text_scrollable_set(en, EINA_TRUE);
@@ -130,7 +130,7 @@ my_efl_ui_text_bt_3(void *data, Evas_Object *obj
EINA_UNUSED, void *event_info E
{
Efl_Text_Cursor_Cursor *sel_start, *sel_end;
- efl_ui_text_interactive_selection_cursors_get(data, &sel_start, &sel_end);
+ efl_text_interactive_selection_cursors_get(data, &sel_start, &sel_end);
const char *s = efl_canvas_text_range_text_get(data, sel_start, sel_end);
printf("SELECTION REGION: %d - %d\n",
@@ -226,7 +226,7 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *eve
efl_text_annotation_insert(en, main_cur, cur, "a href=#hello");
- efl_ui_text_interactive_editable_set(en, EINA_TRUE);
+ efl_text_interactive_editable_set(en, EINA_TRUE);
efl_ui_text_scrollable_set(en, EINA_TRUE);
elm_box_pack_end(bx, en);
elm_object_focus_set(en, EINA_TRUE);
@@ -464,7 +464,7 @@ test_ui_text_item_factory(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
efl_text_cursor_item_insert(en, cur, buf, "size=32x32");
efl_text_cursor_position_set(en, main_cur, 5);
- efl_ui_text_interactive_editable_set(en, EINA_TRUE);
+ efl_text_interactive_editable_set(en, EINA_TRUE);
efl_ui_text_scrollable_set(en, EINA_TRUE);
elm_box_pack_end(bx, en);
elm_object_focus_set(en, EINA_TRUE);
diff --git a/src/bin/elementary/test_gfx_filters.c
b/src/bin/elementary/test_gfx_filters.c
index 5087d11f3a..da68bb63d0 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -462,7 +462,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *eve
efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_RESIZE, _text_resize,
NULL);
efl_text_font_set(o, "Sans:style=Bold", default_font_size);
efl_gfx_entity_scale_set(text, elm_config_scale_get());
- efl_text_text_set(o, "EFL");
+ efl_text_set(o, "EFL");
efl_gfx_entity_visible_set(o, 1);
efl_pack(box2, o);
diff --git a/src/bin/elementary/test_part_bg.c
b/src/bin/elementary/test_part_bg.c
index 0d6d608e32..ac4b2941bc 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -77,7 +77,7 @@ _create_box_contents(Evas_Object *box)
content = efl_add(EFL_UI_TEXT_CLASS, content,
efl_text_set(efl_added, "box"),
- efl_ui_text_interactive_editable_set(efl_added,
EINA_FALSE),
+ efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_pack_end(content, efl_added));
for (i = 0; i < MAX_NUM_OF_CONTENT; i++)
diff --git a/src/bin/elementary/test_photocam.c
b/src/bin/elementary/test_photocam.c
index a7d1629e81..f89d64bd57 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -815,7 +815,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSE
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_text_set(efl_added, "Clicking the image will play/pause
animation."),
- efl_ui_text_interactive_editable_set(efl_added, EINA_FALSE),
+ efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_gfx_size_hint_weight_set(efl_added, 1, 0),
efl_canvas_text_style_set(efl_added, NULL, "DEFAULT='align=center
font=Sans font_size=10 color=#fff wrap=word'"),
efl_pack(bx, efl_added)
diff --git a/src/lib/edje/edje_part_invalid.c b/src/lib/edje/edje_part_invalid.c
index e8ca15c437..469de82fd4 100644
--- a/src/lib/edje/edje_part_invalid.c
+++ b/src/lib/edje/edje_part_invalid.c
@@ -57,7 +57,7 @@ EDJE_PART_INVALID_VOID(efl_text_set,
_efl_canvas_layout_part_invalid_efl_text_te
EDJE_PART_INVALID_CONST(const char *, 0, efl_text_get,
_efl_canvas_layout_part_invalid_efl_text_text_get)
EDJE_PART_INVALID_VOID(efl_text_markup_set,
_efl_canvas_layout_part_invalid_efl_text_markup_markup_set, const char *text)
EDJE_PART_INVALID_CONST(const char *, 0, efl_text_markup_get,
_efl_canvas_layout_part_invalid_efl_text_markup_markup_get)
-EDJE_PART_INVALID_CONST(Efl_Text_Cursor_Cursor *, 0, efl_text_cursor_get,
_efl_canvas_layout_part_invalid_efl_text_cursor_text_cursor_get,
Efl_Text_Cursor_Cursor_Get_Type get_type)
+EDJE_PART_INVALID_CONST(Efl_Text_Cursor_Cursor *, 0, efl_text_cursor_get,
_efl_canvas_layout_part_invalid_efl_text_cursor_text_cursor_get,
Efl_Text_Cursor_Get_Type get_type)
EDJE_PART_INVALID_VOID(efl_text_cursor_paragraph_first,
_efl_canvas_layout_part_invalid_efl_text_cursor_cursor_paragraph_first,
Efl_Text_Cursor_Cursor *cur)
EDJE_PART_INVALID_VOID(efl_text_cursor_paragraph_last,
_efl_canvas_layout_part_invalid_efl_text_cursor_cursor_paragraph_last,
Efl_Text_Cursor_Cursor *cur)
EDJE_PART_INVALID_VOID(efl_text_cursor_position_set,
_efl_canvas_layout_part_invalid_efl_text_cursor_cursor_position_set,
Efl_Text_Cursor_Cursor *cur, int position)
@@ -70,7 +70,7 @@ EDJE_PART_INVALID_VOID(efl_text_cursor_char_prev,
_efl_canvas_layout_part_invali
EDJE_PART_INVALID_VOID(efl_text_cursor_line_jump_by,
_efl_canvas_layout_part_invalid_efl_text_cursor_cursor_line_jump_by,
Efl_Text_Cursor_Cursor *cur, int by)
EDJE_PART_INVALID_VOID(efl_text_cursor_copy,
_efl_canvas_layout_part_invalid_efl_text_cursor_cursor_copy,
Efl_Text_Cursor_Cursor *dst, const Efl_Text_Cursor_Cursor *src)
EDJE_PART_INVALID_CONST(Eina_Unicode, 0, efl_text_cursor_content_get,
_efl_canvas_layout_part_invalid_efl_text_cursor_cursor_content_get, const
Efl_Text_Cursor_Cursor *cur)
-EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_text_cursor_geometry_get,
_efl_canvas_layout_part_invalid_efl_text_cursor_cursor_geometry_get, const
Efl_Text_Cursor_Cursor *cur, Efl_Text_Cursor_Cursor_Type ctype, int *cx, int
*cy, int *cw, int *ch, int *cx2, int *cy2, int *cw2, int *ch2)
+EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_text_cursor_geometry_get,
_efl_canvas_layout_part_invalid_efl_text_cursor_cursor_geometry_get, const
Efl_Text_Cursor_Cursor *cur, Efl_Text_Cursor_Type ctype, int *cx, int *cy, int
*cw, int *ch, int *cx2, int *cy2, int *cw2, int *ch2)
EDJE_PART_INVALID_VOID(efl_text_markup_cursor_markup_insert,
_efl_canvas_layout_part_invalid_efl_text_markup_cursor_markup_insert,
Efl_Text_Cursor_Cursor *cur, const char *markup)
EDJE_PART_INVALID(Eina_Iterator *, 0, efl_content_iterate,
_efl_canvas_layout_part_invalid_efl_container_content_iterate)
EDJE_PART_INVALID(int, 0, efl_content_count,
_efl_canvas_layout_part_invalid_efl_container_content_count)
diff --git a/src/lib/edje/edje_part_text.c b/src/lib/edje/edje_part_text.c
index 0790a88905..6e8e231ae2 100644
--- a/src/lib/edje/edje_part_text.c
+++ b/src/lib/edje/edje_part_text.c
@@ -11,7 +11,7 @@ _efl_canvas_layout_part_text_efl_text_text_set(Eo *obj,
void *_pd EINA_UNUSED, const char *text)
{
PROXY_DATA_GET(obj, pd);
- _edje_efl_text_set(obj, pd->ed, pd->part, text, EINA_FALSE, EINA_FALSE);
+ _edje_efl_text_text_set(obj, pd->ed, pd->part, text, EINA_FALSE,
EINA_FALSE);
}
EOLIAN static const char *
@@ -19,7 +19,7 @@ _efl_canvas_layout_part_text_efl_text_text_get(const Eo *obj,
void *_pd EINA_UNUSED)
{
PROXY_DATA_GET(obj, pd);
- return _edje_efl_text_get(obj, pd->ed, pd->part, EINA_FALSE, EINA_FALSE);
+ return _edje_efl_text_text_get(obj, pd->ed, pd->part, EINA_FALSE,
EINA_FALSE);
}
EOLIAN static const char *
@@ -27,7 +27,7 @@ _efl_canvas_layout_part_text_efl_text_markup_markup_get(const
Eo *obj,
void *_pd EINA_UNUSED)
{
PROXY_DATA_GET(obj, pd);
- return _edje_efl_text_get(obj, pd->ed, pd->part, EINA_FALSE, EINA_TRUE);
+ return _edje_efl_text_text_get(obj, pd->ed, pd->part, EINA_FALSE,
EINA_TRUE);
}
EOLIAN static void
@@ -35,13 +35,13 @@ _efl_canvas_layout_part_text_efl_text_markup_markup_set(Eo
*obj,
void *_pd EINA_UNUSED, const char *text)
{
PROXY_DATA_GET(obj, pd);
- _edje_efl_text_set(obj, pd->ed, pd->part, text, EINA_FALSE, EINA_TRUE);
+ _edje_efl_text_text_set(obj, pd->ed, pd->part, text, EINA_FALSE, EINA_TRUE);
}
EOLIAN static Efl_Text_Cursor_Cursor *
_efl_canvas_layout_part_text_efl_text_cursor_text_cursor_get(const Eo *obj,
- void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Get_Type get_type)
+ void *_pd EINA_UNUSED, Efl_Text_Cursor_Get_Type get_type)
{
PROXY_DATA_GET(obj, pd);
return _edje_text_cursor_get(pd->rp, (int) get_type);
@@ -171,7 +171,7 @@ EOLIAN static Eina_Bool
_efl_canvas_layout_part_text_efl_text_cursor_cursor_geometry_get(const Eo *obj,
void *_pd EINA_UNUSED,
const Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
- Efl_Text_Cursor_Cursor_Type ctype EINA_UNUSED,
+ Efl_Text_Cursor_Type ctype EINA_UNUSED,
Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch,
Evas_Coord *cx2 EINA_UNUSED, Evas_Coord *cy2 EINA_UNUSED,
Evas_Coord *cw2 EINA_UNUSED, Evas_Coord *ch2 EINA_UNUSED)
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 691b4ff491..5d2a2e7bac 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -3186,8 +3186,8 @@ Evas_Object *_edje_object_part_external_content_get(Edje
*ed, const char *part,
/* part text */
Eo *_edje_text_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part
*rp, const char *part);
-Eina_Bool _edje_efl_text_set(Eo *obj, Edje *ed, const char *part, const char
*text, Eina_Bool legacy, Eina_Bool set_markup);
-const char *_edje_efl_text_get(const Eo *obj, Edje *ed, const char *part,
Eina_Bool legacy, Eina_Bool get_markup);
+Eina_Bool _edje_efl_text_text_set(Eo *obj, Edje *ed, const char *part, const
char *text, Eina_Bool legacy, Eina_Bool set_markup);
+const char *_edje_efl_text_text_get(const Eo *obj, Edje *ed, const char *part,
Eina_Bool legacy, Eina_Bool get_markup);
Eina_Bool _edje_efl_text_markup_set(Eo *obj, Edje *ed, const char *part,
const char *markup);
const char *_edje_efl_text_markup_get(Eo *obj, Edje *ed, const char *part);
Evas_Textblock_Cursor *_edje_text_cursor_get(Edje_Real_Part *rp, Edje_Cursor
cur);
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 629960200e..3f079a97bd 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -2022,7 +2022,7 @@ _edje_user_define_string(Edje *ed, const char *part,
const char *raw_text, Edje_
}
Eina_Bool
-_edje_efl_text_set(Eo *obj, Edje *ed, const char *part, const char *text,
+_edje_efl_text_text_set(Eo *obj, Edje *ed, const char *part, const char *text,
Eina_Bool legacy, Eina_Bool set_markup)
{
Edje_Real_Part *rp;
@@ -2045,7 +2045,7 @@ _edje_efl_text_set(Eo *obj, Edje *ed, const char *part,
const char *text,
}
const char *
-_edje_efl_text_get(const Eo *obj EINA_UNUSED, Edje *ed, const char *part,
+_edje_efl_text_text_get(const Eo *obj EINA_UNUSED, Edje *ed, const char *part,
Eina_Bool legacy, Eina_Bool get_markup)
{
Edje_Real_Part *rp;
@@ -6281,7 +6281,7 @@ edje_object_part_text_set(const Edje_Object *obj, const
char *part, const char *
ed = _edje_fetch(obj);
- _edje_efl_text_set((Eo *) obj, ed, part, text, EINA_TRUE, EINA_FALSE);
+ _edje_efl_text_text_set((Eo *) obj, ed, part, text, EINA_TRUE, EINA_FALSE);
return EINA_TRUE;
}
@@ -6299,7 +6299,7 @@ edje_object_part_text_get(const Edje_Object *obj, const
char *part)
ERR("Invalid call on a non-text or non-textblock part: '%s' in group
'%s'", part, ed->group);
return NULL;
}
- return _edje_efl_text_get(obj, ed, part, EINA_TRUE, EINA_FALSE);
+ return _edje_efl_text_text_get(obj, ed, part, EINA_TRUE, EINA_FALSE);
}
/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
diff --git a/src/lib/edje/efl_canvas_layout_part_invalid.eo
b/src/lib/edje/efl_canvas_layout_part_invalid.eo
index fd8e57c22b..45722c5b1c 100644
--- a/src/lib/edje/efl_canvas_layout_part_invalid.eo
+++ b/src/lib/edje/efl_canvas_layout_part_invalid.eo
@@ -3,7 +3,7 @@ import edje_types;
class Efl.Canvas.Layout_Part_Invalid (Efl.Canvas.Layout_Part, Efl.Content,
Efl.Pack_Linear, Efl.Ui.Direction,
Efl.Pack_Table, Efl.Text,
- Efl.Text.Markup, Efl.Text.Cursor)
+ Efl.Text_Markup, Efl.Text_Cursor)
{
[[Common class for part proxy objects for @Efl.Canvas.Layout.
@@ -32,21 +32,21 @@ class Efl.Canvas.Layout_Part_Invalid
(Efl.Canvas.Layout_Part, Efl.Content,
Efl.Content.content_unset;
// Efl.Canvas.Layout_Part_Text
Efl.Text.text { set; get; }
- Efl.Text.Markup.markup { get; set; }
- Efl.Text.Cursor.text_cursor { get; }
- Efl.Text.Cursor.cursor_paragraph_first;
- Efl.Text.Cursor.cursor_paragraph_last;
- Efl.Text.Cursor.cursor_position { set; get; }
- Efl.Text.Cursor.cursor_coord_set;
- Efl.Text.Cursor.cursor_line_char_first;
- Efl.Text.Cursor.cursor_line_char_last;
- Efl.Text.Cursor.cursor_char_next;
- Efl.Text.Cursor.cursor_char_prev;
- Efl.Text.Cursor.cursor_line_jump_by;
- Efl.Text.Cursor.cursor_copy;
- Efl.Text.Cursor.cursor_content { get; }
- Efl.Text.Cursor.cursor_geometry { get; }
- Efl.Text.Markup.cursor_markup_insert;
+ Efl.Text_Markup.markup { get; set; }
+ Efl.Text_Cursor.text_cursor { get; }
+ Efl.Text_Cursor.cursor_paragraph_first;
+ Efl.Text_Cursor.cursor_paragraph_last;
+ Efl.Text_Cursor.cursor_position { set; get; }
+ Efl.Text_Cursor.cursor_coord_set;
+ Efl.Text_Cursor.cursor_line_char_first;
+ Efl.Text_Cursor.cursor_line_char_last;
+ Efl.Text_Cursor.cursor_char_next;
+ Efl.Text_Cursor.cursor_char_prev;
+ Efl.Text_Cursor.cursor_line_jump_by;
+ Efl.Text_Cursor.cursor_copy;
+ Efl.Text_Cursor.cursor_content { get; }
+ Efl.Text_Cursor.cursor_geometry { get; }
+ Efl.Text_Markup.cursor_markup_insert;
// Efl.Canvas.Layout_Part_Box
Efl.Container.content_iterate;
Efl.Container.content_count;
diff --git a/src/lib/edje/efl_canvas_layout_part_text.eo
b/src/lib/edje/efl_canvas_layout_part_text.eo
index 088cba84bd..b59f470a5b 100644
--- a/src/lib/edje/efl_canvas_layout_part_text.eo
+++ b/src/lib/edje/efl_canvas_layout_part_text.eo
@@ -1,5 +1,5 @@
class Efl.Canvas.Layout_Part_Text (Efl.Canvas.Layout_Part, Efl.Text,
-Efl.Text.Markup, Efl.Text.Cursor)
+Efl.Text_Markup, Efl.Text_Cursor)
{
[[Represents a TEXT part of a layout
@@ -9,20 +9,20 @@ Efl.Text.Markup, Efl.Text.Cursor)
data: null;
implements {
Efl.Text.text { set; get; }
- Efl.Text.Markup.markup { get; set; }
- Efl.Text.Cursor.text_cursor { get; }
- Efl.Text.Cursor.cursor_paragraph_first;
- Efl.Text.Cursor.cursor_paragraph_last;
- Efl.Text.Cursor.cursor_position { set; get; }
- Efl.Text.Cursor.cursor_coord_set;
- Efl.Text.Cursor.cursor_line_char_first;
- Efl.Text.Cursor.cursor_line_char_last;
- Efl.Text.Cursor.cursor_char_next;
- Efl.Text.Cursor.cursor_char_prev;
- Efl.Text.Cursor.cursor_line_jump_by;
- Efl.Text.Cursor.cursor_copy;
- Efl.Text.Cursor.cursor_content { get; }
- Efl.Text.Cursor.cursor_geometry { get; }
- Efl.Text.Markup.cursor_markup_insert;
+ Efl.Text_Markup.markup { get; set; }
+ Efl.Text_Cursor.text_cursor { get; }
+ Efl.Text_Cursor.cursor_paragraph_first;
+ Efl.Text_Cursor.cursor_paragraph_last;
+ Efl.Text_Cursor.cursor_position { set; get; }
+ Efl.Text_Cursor.cursor_coord_set;
+ Efl.Text_Cursor.cursor_line_char_first;
+ Efl.Text_Cursor.cursor_line_char_last;
+ Efl.Text_Cursor.cursor_char_next;
+ Efl.Text_Cursor.cursor_char_prev;
+ Efl.Text_Cursor.cursor_line_jump_by;
+ Efl.Text_Cursor.cursor_copy;
+ Efl.Text_Cursor.cursor_content { get; }
+ Efl.Text_Cursor.cursor_geometry { get; }
+ Efl.Text_Markup.cursor_markup_insert;
}
}
diff --git a/src/lib/efl/interfaces/efl_text_annotate.eo
b/src/lib/efl/interfaces/efl_text_annotate.eo
index 5800fa6ffd..bb407259cd 100644
--- a/src/lib/efl/interfaces/efl_text_annotate.eo
+++ b/src/lib/efl/interfaces/efl_text_annotate.eo
@@ -1,7 +1,7 @@
import eina_types;
import efl_text_types;
-interface Efl.Text.Annotate {
+interface Efl.Text_Annotate {
[[Cursor API
@since 1.20
@@ -27,7 +27,7 @@ interface Efl.Text.Annotate {
legacy: null;
}
keys {
- annotation: ptr(Efl.Text.Annotate.Annotation); [[Given annotation]]
+ annotation: ptr(Efl.Text_Annotate_Annotation); [[Given annotation]]
}
values {
format: string; [[The new format for the given annotation]]
@@ -40,10 +40,10 @@ interface Efl.Text.Annotate {
]]
legacy: null;
params {
- @in start: ptr(const(Efl.Text.Cursor.Cursor)); [[Start of range]]
- @in end: ptr(const(Efl.Text.Cursor.Cursor)); [[End of range]]
+ @in start: ptr(const(Efl.Text_Cursor_Cursor)); [[Start of range]]
+ @in end: ptr(const(Efl.Text_Cursor_Cursor)); [[End of range]]
}
- return: iterator<ptr(Efl.Text.Annotate.Annotation)> @owned; [[Handle
of the Annotation]]
+ return: iterator<ptr(Efl.Text_Annotate_Annotation)> @owned; [[Handle
of the Annotation]]
}
annotation_insert {
[[Inserts an annotation format in a specified range [$start, $end -
1].
@@ -55,11 +55,11 @@ interface Efl.Text.Annotate {
]]
legacy: null;
params {
- @in start: ptr(Efl.Text.Cursor.Cursor); [[Start of range]]
- @in end: ptr(Efl.Text.Cursor.Cursor); [[End of range]]
+ @in start: ptr(Efl.Text_Cursor_Cursor); [[Start of range]]
+ @in end: ptr(Efl.Text_Cursor_Cursor); [[End of range]]
@in format: string; [[Annotation format]]
}
- return: ptr(Efl.Text.Annotate.Annotation); [[Handle of inserted
annotation]]
+ return: ptr(Efl.Text_Annotate_Annotation); [[Handle of inserted
annotation]]
}
annotation_del {
[[Deletes given annotation.
@@ -71,7 +71,7 @@ interface Efl.Text.Annotate {
]]
legacy: null;
params {
- @in annotation: ptr(Efl.Text.Annotate.Annotation); [[Annotation to
be
+ @in annotation: ptr(Efl.Text_Annotate_Annotation); [[Annotation to
be
removed]]
}
return: bool; [[$true on success, $false otherwise.]]
@@ -86,11 +86,11 @@ interface Efl.Text.Annotate {
]]
legacy: null;
params {
- @in annotation: ptr(const(Efl.Text.Annotate.Annotation));
[[Annotation
+ @in annotation: ptr(const(Efl.Text_Annotate_Annotation));
[[Annotation
handle to query]]
- @in start: ptr(Efl.Text.Cursor.Cursor); [[Cursor to be set to the
start
+ @in start: ptr(Efl.Text_Cursor_Cursor); [[Cursor to be set to the
start
position of the annotation in the text]]
- @in end: ptr(Efl.Text.Cursor.Cursor); [[Cursor to be set to the
end
+ @in end: ptr(Efl.Text_Cursor_Cursor); [[Cursor to be set to the
end
position of the annotation in the text]]
}
}
@@ -106,7 +106,7 @@ interface Efl.Text.Annotate {
]]
legacy: null;
params {
- annotation: ptr(Efl.Text.Annotate.Annotation); [[Given annotation]]
+ annotation: ptr(Efl.Text_Annotate_Annotation); [[Given annotation]]
}
return: bool; [[$true if given annotation is an object item, $false
otherwise]]
}
@@ -119,7 +119,7 @@ interface Efl.Text.Annotate {
]]
legacy: null;
params {
- @in an: ptr(const(Efl.Text.Annotate.Annotation)); [[Given
annotation to query]]
+ @in an: ptr(const(Efl.Text_Annotate_Annotation)); [[Given
annotation to query]]
@out x: int; [[X coordinate of the annotation]]
@out y: int; [[Y coordinate of the annotation]]
@out w: int; [[Width of the annotation]]
@@ -134,10 +134,10 @@ interface Efl.Text.Annotate {
legacy: null;
}
values {
- annotation: ptr(Efl.Text.Annotate.Annotation); [[Annotation]]
+ annotation: ptr(Efl.Text_Annotate_Annotation); [[Annotation]]
}
keys {
- cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
cursor_item_insert {
@@ -149,14 +149,14 @@ interface Efl.Text.Annotate {
]]
legacy: null;
params {
- cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
@in item: string; [[Item key to be used in higher-up
code to query and decided what image,
emoticon
etc. to embed.]]
@in format: string; [[Size format of the inserted item.
This hints how to size the item in the
text.]]
}
- return: ptr(Efl.Text.Annotate.Annotation); [[The annotation handle of
the
+ return: ptr(Efl.Text_Annotate_Annotation); [[The annotation handle of
the
inserted item.]]
}
}
diff --git a/src/lib/efl/interfaces/efl_text_cursor.eo
b/src/lib/efl/interfaces/efl_text_cursor.eo
index 06835cd355..973c7d85bd 100644
--- a/src/lib/efl/interfaces/efl_text_cursor.eo
+++ b/src/lib/efl/interfaces/efl_text_cursor.eo
@@ -1,7 +1,7 @@
import eina_types;
import efl_text_types;
-enum Efl.Text.Cursor.Cursor_Get_Type {
+enum Efl.Text_Cursor_Get_Type {
[[All available cursor states]]
legacy: efl_text_cursor_get;
default = 0, [[Main cursor state (alias to "main")]]
@@ -14,7 +14,7 @@ enum Efl.Text.Cursor.Cursor_Get_Type {
user_extra [[User extra cursor state]]
}
-enum Efl.Text.Cursor.Cursor_Type
+enum Efl.Text_Cursor_Type
{
[[Text cursor types]]
legacy: efl_text_cursor_type;
@@ -22,7 +22,7 @@ enum Efl.Text.Cursor.Cursor_Type
under [[Cursor type under]]
}
-interface Efl.Text.Cursor {
+interface Efl.Text_Cursor {
[[Cursor API
@since 1.20
@@ -36,10 +36,10 @@ interface Efl.Text.Cursor {
]]
get {
legacy: null;
- return: ptr(Efl.Text.Cursor.Cursor); [[Text cursor object]]
+ return: ptr(Efl.Text_Cursor_Cursor); [[Text cursor object]]
}
keys {
- get_type: Efl.Text.Cursor.Cursor_Get_Type; [[Cursor type]]
+ get_type: Efl.Text_Cursor_Get_Type; [[Cursor type]]
}
}
@property cursor_position {
@@ -50,7 +50,7 @@ interface Efl.Text.Cursor {
position: int; [[Cursor position]]
}
keys {
- cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
@property cursor_content {
@@ -62,7 +62,7 @@ interface Efl.Text.Cursor {
content: Eina.Unicode; [[The unicode codepoint of the character]]
}
keys {
- @cref cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
+ @cref cur: Efl.Text_Cursor_Cursor; [[Cursor object]]
}
}
@property cursor_geometry {
@@ -79,8 +79,8 @@ interface Efl.Text.Cursor {
return: bool; [[ $true if split cursor, $false otherwise.]]
}
keys {
- @cref cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
- ctype: Efl.Text.Cursor.Cursor_Type; [[The type of the cursor.]]
+ @cref cur: Efl.Text_Cursor_Cursor; [[Cursor object]]
+ ctype: Efl.Text_Cursor_Type; [[The type of the cursor.]]
}
values {
cx: int; [[The x of the cursor (or upper cursor)]]
@@ -96,21 +96,21 @@ interface Efl.Text.Cursor {
cursor_new {
[[Create new cursor]]
legacy: null;
- return: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ return: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
cursor_free {
[[Free existing cursor]]
legacy: null;
params {
- cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
cursor_equal {
[[Check if two cursors are equal]]
legacy: null;
params {
- @cref cur1: Efl.Text.Cursor.Cursor; [[Cursor 1 object]]
- @cref cur2: Efl.Text.Cursor.Cursor; [[Cursor 2 object]]
+ @cref cur1: Efl.Text_Cursor_Cursor; [[Cursor 1 object]]
+ @cref cur2: Efl.Text_Cursor_Cursor; [[Cursor 2 object]]
}
return: bool; [[$true if cursors are equal, $false otherwise]]
}
@@ -118,8 +118,8 @@ interface Efl.Text.Cursor {
[[Compare two cursors]]
legacy: null;
params {
- @cref cur1: Efl.Text.Cursor.Cursor; [[Cursor 1 object]]
- @cref cur2: Efl.Text.Cursor.Cursor; [[Cursor 2 object]]
+ @cref cur1: Efl.Text_Cursor_Cursor; [[Cursor 1 object]]
+ @cref cur2: Efl.Text_Cursor_Cursor; [[Cursor 2 object]]
}
return: int; [[Difference between cursors]]
}
@@ -127,99 +127,99 @@ interface Efl.Text.Cursor {
[[Copy existing cursor]]
legacy: null;
params {
- /* @out */ dst: ptr(Efl.Text.Cursor.Cursor); [[Destination cursor]]
- @cref src: Efl.Text.Cursor.Cursor; [[Source cursor]]
+ /* @out */ dst: ptr(Efl.Text_Cursor_Cursor); [[Destination cursor]]
+ @cref src: Efl.Text_Cursor_Cursor; [[Source cursor]]
}
}
cursor_char_next {
[[Advances to the next character]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
cursor_char_prev {
[[Advances to the previous character]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
cursor_paragraph_char_first {
[[Advances to the first character in this paragraph]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
cursor_paragraph_char_last {
[[Advances to the last character in this paragraph]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
cursor_word_start {
[[Advance to current word start]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
cursor_word_end {
[[Advance to current word end]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
cursor_line_char_first {
[[Advance to current line first character]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
cursor_line_char_last {
[[Advance to current line last character]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
cursor_paragraph_first {
[[Advance to current paragraph first character]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
cursor_paragraph_last {
[[Advance to current paragraph last character]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
cursor_paragraph_next {
[[Advances to the start of the next text node]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
cursor_paragraph_prev {
[[Advances to the end of the previous text node]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
cursor_line_jump_by {
[[Jump the cursor by the given number of lines]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
by: int; [[Number of lines]]
}
}
@@ -227,7 +227,7 @@ interface Efl.Text.Cursor {
[[Set cursor coordinates]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
@in x: int; [[X coord to set by.]]
@in y: int; [[Y coord to set by.]]
}
@@ -238,7 +238,7 @@ interface Efl.Text.Cursor {
]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
@in text: string; [[Text to append (UTF-8 format).]]
}
return: int; [[Length of the appended text.]]
@@ -247,7 +247,7 @@ interface Efl.Text.Cursor {
[[Deletes a single character from position pointed by given cursor.]]
legacy: null;
params {
- /* @inout */ cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+ /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
}
}
}
diff --git a/src/lib/efl/interfaces/efl_text_font.eo
b/src/lib/efl/interfaces/efl_text_font.eo
index 4daf73aef2..34e5dab22a 100644
--- a/src/lib/efl/interfaces/efl_text_font.eo
+++ b/src/lib/efl/interfaces/efl_text_font.eo
@@ -1,6 +1,6 @@
// src/lib/efl/interfaces/efl_text_font.eo
import efl_gfx_types;
-enum Efl.Text.Font.Weight {
+enum Efl.Text_Font_Weight {
[[Type of font weight]]
normal, [[Normal font weight]]
thin, [[Thin font weight]]
@@ -17,7 +17,7 @@ enum Efl.Text.Font.Weight {
extrablack, [[Extrablack font weight]]
}
-enum Efl.Text.Font.Width {
+enum Efl.Text_Font_Width {
[[Type of font width]]
normal, [[Normal font width]]
ultracondensed, [[Ultracondensed font width]]
@@ -30,7 +30,7 @@ enum Efl.Text.Font.Width {
ultraexpanded, [[Ultraexpanded font width]]
}
-enum Efl.Text.Font.Slant {
+enum Efl.Text_Font_Slant {
[[Type of font slant]]
normal, [[Normal font slant]]
oblique, [[Oblique font slant]]
@@ -40,7 +40,7 @@ enum Efl.Text.Font.Slant {
/* FIXME: It needs to support "normal" option for non-color bitmap font.
For supporting "normal" option, S/W glyph drawing engine should be updated.
*/
-enum Efl.Text.Font.Bitmap_Scalable {
+enum Efl.Text_Font_Bitmap_Scalable {
[[Scalable of bitmap fonts
@since 1.21
@@ -49,7 +49,7 @@ enum Efl.Text.Font.Bitmap_Scalable {
color = (1 << 0), [[Enable scalable feature for color bitmap fonts.]]
}
-interface Efl.Text.Font {
+interface Efl.Text_Font {
[[Font settings of the text
@since 1.20
@@ -122,30 +122,30 @@ interface Efl.Text.Font {
@property font_weight {
[[Type of weight of the displayed font
- Default is @Efl.Text.Font.Weight.normal\.
+ Default is @Efl.Text_Font_Weight.normal\.
]]
values {
- font_weight: Efl.Text.Font.Weight; [[Font weight]]
+ font_weight: Efl.Text_Font_Weight; [[Font weight]]
}
}
@property font_slant {
[[Type of slant of the displayed font
- Default is @Efl.Text.Font.Slant.normal\.
+ Default is @Efl.Text_Font_Slant.normal\.
]]
values {
- style: Efl.Text.Font.Slant; [[Font slant]]
+ style: Efl.Text_Font_Slant; [[Font slant]]
}
}
@property font_width {
[[Type of width of the displayed font
- Default is @Efl.Text.Font.Width.normal\.
+ Default is @Efl.Text_Font_Width.normal\.
]]
values {
- width: Efl.Text.Font.Width; [[Font width]]
+ width: Efl.Text_Font_Width; [[Font width]]
}
}
@@ -167,10 +167,10 @@ interface Efl.Text.Font {
Basically, it is not scalable. But, it needs to be scalable for
some use cases.
(ex. colorful emoji fonts)
- Default is @Efl.Text.Font.Bitmap_Scalable.none\.
+ Default is @Efl.Text_Font_Bitmap_Scalable.none\.
]]
values {
- scalable: Efl.Text.Font.Bitmap_Scalable; [[Scalable]]
+ scalable: Efl.Text_Font_Bitmap_Scalable; [[Scalable]]
}
}
}
diff --git a/src/lib/efl/interfaces/efl_text_format.eo
b/src/lib/efl/interfaces/efl_text_format.eo
index 0155625d78..0ec9c98240 100644
--- a/src/lib/efl/interfaces/efl_text_format.eo
+++ b/src/lib/efl/interfaces/efl_text_format.eo
@@ -1,4 +1,4 @@
-enum Efl.Text.Format.Wrap {
+enum Efl.Text_Format_Wrap {
[[Wrap mode of the text (not in effect if not multiline)]]
none, [[No wrapping]]
char, [[Wrap mode character]]
@@ -7,7 +7,7 @@ enum Efl.Text.Format.Wrap {
hyphenation [[Wrap mode hyphenation]]
}
-enum Efl.Text.Format.Horizontal_Alignment_Auto_Type {
+enum Efl.Text_Format_Horizontal_Alignment_Auto_Type {
[[Auto-horizontal alignment of the text]]
legacy: efl_text_horizontal_alignment_auto;
none, [[No auto-alignment rule]]
@@ -16,7 +16,7 @@ enum Efl.Text.Format.Horizontal_Alignment_Auto_Type {
end [[Text is places at opposite side of LTR/RTL (bidirectional)
settings]]
}
-interface Efl.Text.Format {
+interface Efl.Text_Format {
[[The look and layout of the text
The text format can affect the geometry of the text object, as well as
@@ -37,7 +37,7 @@ interface Efl.Text.Format {
@property wrap {
[[Wrap mode for use in the text]]
values {
- wrap: Efl.Text.Format.Wrap; [[Wrap mode]]
+ wrap: Efl.Text_Format_Wrap; [[Wrap mode]]
}
}
@@ -51,7 +51,7 @@ interface Efl.Text.Format {
@property halign_auto_type {
[[Horizontal alignment of text]]
values {
- value: Efl.Text.Format.Horizontal_Alignment_Auto_Type; [[Alignment
type]]
+ value: Efl.Text_Format_Horizontal_Alignment_Auto_Type; [[Alignment
type]]
}
}
diff --git a/src/lib/efl/interfaces/efl_text_markup.eo
b/src/lib/efl/interfaces/efl_text_markup.eo
index 5f1782703b..7e2bbaaaee 100644
--- a/src/lib/efl/interfaces/efl_text_markup.eo
+++ b/src/lib/efl/interfaces/efl_text_markup.eo
@@ -1,4 +1,4 @@
-interface Efl.Text.Markup(Efl.Text.Cursor) {
+interface Efl.Text_Markup(Efl.Text_Cursor) {
[[Markup data that populates the text object's style and format
@since 1.21
@@ -13,7 +13,7 @@ interface Efl.Text.Markup(Efl.Text.Cursor) {
cursor_markup_insert {
[[Inserts a markup text to the text object in a given cursor
position]]
params {
- cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor position to insert
markup]]
+ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor position to insert
markup]]
@in markup: string; [[The markup text to insert]]
}
}
diff --git a/src/lib/efl/interfaces/efl_text_markup_util.eo
b/src/lib/efl/interfaces/efl_text_markup_util.eo
index 304b2cacf9..eb64791b67 100644
--- a/src/lib/efl/interfaces/efl_text_markup_util.eo
+++ b/src/lib/efl/interfaces/efl_text_markup_util.eo
@@ -1,4 +1,4 @@
-class Efl.Text.Markup_Util () {
+class Efl.Text_Markup_Util () {
[[Utility class for markup, such as conversions
@since 1.21.
diff --git a/src/lib/efl/interfaces/efl_text_style.eo
b/src/lib/efl/interfaces/efl_text_style.eo
index 70b95a08d4..395609626c 100644
--- a/src/lib/efl/interfaces/efl_text_style.eo
+++ b/src/lib/efl/interfaces/efl_text_style.eo
@@ -1,18 +1,18 @@
-enum Efl.Text.Style.Backing_Type
+enum Efl.Text_Style_Backing_Type
{
[[Whether to apply backing style to the displayed text or not]]
disabled = 0, [[Do not use backing]]
enabled, [[Use backing style]]
}
-enum Efl.Text.Style.Strikethrough_Type
+enum Efl.Text_Style_Strikethrough_Type
{
[[Whether to apply strikethrough style to the displayed text or not]]
disabled = 0, [[Do not use strikethrough]]
enabled, [[Use strikethrough style]]
}
-enum Efl.Text.Style.Effect_Type
+enum Efl.Text_Style_Effect_Type
{
[[Effect to apply to the displayed text]]
none = 0, [[No effect]]
@@ -32,7 +32,7 @@ enum Efl.Text.Style.Effect_Type
outline_soft_shadow, [[Outline soft shadow effect]]
}
-enum Efl.Text.Style.Shadow_Direction
+enum Efl.Text_Style_Shadow_Direction
{
[[Direction of the shadow style, if used]]
bottom_right = 0, [[Shadow towards bottom right]]
@@ -45,7 +45,7 @@ enum Efl.Text.Style.Shadow_Direction
right, [[Shadow towards right]]
}
-enum Efl.Text.Style.Underline_Type
+enum Efl.Text_Style_Underline_Type
{
[[Underline type of the displayed text]]
off = 0, [[Text without underline]]
@@ -55,7 +55,7 @@ enum Efl.Text.Style.Underline_Type
dashed, [[Underlined with a dashed line]]
}
-interface Efl.Text.Style {
+interface Efl.Text_Style {
[[Style to apply to the text
A style can be coloring, effects, underline, strikethrough etc.
@@ -79,7 +79,7 @@ interface Efl.Text.Style {
[[Enable or disable backing type]]
values
{
- type: Efl.Text.Style.Backing_Type; [[Backing type]]
+ type: Efl.Text_Style_Backing_Type; [[Backing type]]
}
}
@@ -98,7 +98,7 @@ interface Efl.Text.Style {
[[Sets an underline style on the text]]
values
{
- type: Efl.Text.Style.Underline_Type; [[Underline type]]
+ type: Efl.Text_Style_Underline_Type; [[Underline type]]
}
}
@@ -158,7 +158,7 @@ interface Efl.Text.Style {
[[Type of underline2 style]]
values
{
- type: Efl.Text.Style.Underline_Type; [[Underline type]]
+ type: Efl.Text_Style_Underline_Type; [[Underline type]]
}
}
@@ -178,7 +178,7 @@ interface Efl.Text.Style {
[[Type of strikethrough style]]
values
{
- type: Efl.Text.Style.Strikethrough_Type; [[Strikethrough type]]
+ type: Efl.Text_Style_Strikethrough_Type; [[Strikethrough type]]
}
}
@@ -197,7 +197,7 @@ interface Efl.Text.Style {
@property effect_type {
[[Type of effect used for the displayed text]]
values {
- type: Efl.Text.Style.Effect_Type; [[Effect type]]
+ type: Efl.Text_Style_Effect_Type; [[Effect type]]
}
}
@property outline_color
@@ -217,7 +217,7 @@ interface Efl.Text.Style {
[[Direction of shadow effect]]
values
{
- type: Efl.Text.Style.Shadow_Direction; [[Shadow direction]]
+ type: Efl.Text_Style_Shadow_Direction; [[Shadow direction]]
}
}
diff --git a/src/lib/efl/interfaces/efl_text_types.eot
b/src/lib/efl/interfaces/efl_text_types.eot
index d3f7d204f2..0d9c5ee723 100644
--- a/src/lib/efl/interfaces/efl_text_types.eot
+++ b/src/lib/efl/interfaces/efl_text_types.eot
@@ -19,7 +19,7 @@ struct Efl.Ui.Text.Change_Info {
merge: bool; [[$true if can be merged with the previous one. Used for
example with insertion when something is already selected]]
}
-type @extern Efl.Text.Annotate.Annotation: __undefined_type; [[EFL text
annotations data structure]]
+type @extern Efl.Text_Annotate_Annotation: __undefined_type; [[EFL text
annotations data structure]]
-type @extern Efl.Text.Cursor.Cursor: __undefined_type; [[Text cursor data
structure]]
+type @extern Efl.Text_Cursor_Cursor: __undefined_type; [[Text cursor data
structure]]
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index 8fe0230849..0a79fbb60e 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -304,7 +304,7 @@ typedef Eo Efl_Ui_Focus_Manager;
# include <efl_ui_win.eo.h>
# include <efl_ui_win_inlined.eo.h>
# include <efl_ui_win_socket.eo.h>
-# include <efl_ui_text_interactive.eo.h>
+# include <efl_text_interactive.eo.h>
# include <efl_ui_text.eo.h>
# include <efl_ui_popup.eo.h>
# include <efl_ui_popup_alert.eo.h>
diff --git a/src/lib/elementary/efl_ui_text_interactive.eo
b/src/lib/elementary/efl_text_interactive.eo
similarity index 85%
rename from src/lib/elementary/efl_ui_text_interactive.eo
rename to src/lib/elementary/efl_text_interactive.eo
index a56857f8fb..8730cb6e66 100644
--- a/src/lib/elementary/efl_ui_text_interactive.eo
+++ b/src/lib/elementary/efl_text_interactive.eo
@@ -1,7 +1,7 @@
import efl_text_types;
-interface Efl.Ui.Text.Interactive (Efl.Text, Efl.Text.Font,
- Efl.Text.Format, Efl.Text.Style)
+interface Efl.Text_Interactive (Efl.Text, Efl.Text_Font,
+ Efl.Text_Format, Efl.Text_Style)
{
[[This is an interface interactive text inputs should implement]]
methods {
@@ -24,8 +24,8 @@ interface Efl.Ui.Text.Interactive (Efl.Text, Efl.Text.Font,
]]
get {}
values {
- start: ptr(Efl.Text.Cursor.Cursor); [[The start of the selection]]
- end: ptr(Efl.Text.Cursor.Cursor); [[The end of the selection]]
+ start: ptr(Efl.Text_Cursor_Cursor); [[The start of the selection]]
+ end: ptr(Efl.Text_Cursor_Cursor); [[The end of the selection]]
}
}
@property editable {
diff --git a/src/lib/elementary/efl_ui_button.eo
b/src/lib/elementary/efl_ui_button.eo
index e00707c620..2eb281a40b 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,5 +1,5 @@
class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat,
- Efl.Text, Efl.Text.Markup, Efl.Content,
+ Efl.Text, Efl.Text_Markup, Efl.Content,
Efl.Access.Widget.Action, Efl.Ui.Translatable)
{
[[Push-button widget
diff --git a/src/lib/elementary/efl_ui_frame.eo
b/src/lib/elementary/efl_ui_frame.eo
index f05017f709..038f257de5 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text, Efl.Text.Markup,
+class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup,
Efl.Ui.Translatable, Efl.Content)
{
[[Frame widget
@@ -57,7 +57,7 @@ class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable,
Efl.Text, Efl.Text.Markup,
Efl.Object.constructor;
Efl.Canvas.Group.group_calculate;
Efl.Text.text { get; set; }
- Efl.Text.Markup.markup { get; set; }
+ Efl.Text_Markup.markup { get; set; }
Efl.Ui.Translatable.translatable_text { get; set; }
Efl.Content.content { get; set; }
Efl.Content.content_unset;
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c
b/src/lib/elementary/efl_ui_internal_text_interactive.c
index bc043efb3a..bfe41af303 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -510,7 +510,7 @@ _sel_cursor_changed(void *data, const Efl_Event *event
EINA_UNUSED)
{
Eo *obj = data;
- efl_event_callback_call(obj,
EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL);
+ efl_event_callback_call(obj, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED,
NULL);
}
static void
@@ -1404,35 +1404,35 @@ done:
}
EOLIAN static void
-_efl_ui_internal_text_interactive_efl_ui_text_interactive_selection_allowed_set(Eo
*obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *pd, Eina_Bool allowed)
+_efl_ui_internal_text_interactive_efl_text_interactive_selection_allowed_set(Eo
*obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *pd, Eina_Bool allowed)
{
pd->select_allow = allowed;
}
EOLIAN static Eina_Bool
-_efl_ui_internal_text_interactive_efl_ui_text_interactive_selection_allowed_get(const
Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *pd)
+_efl_ui_internal_text_interactive_efl_text_interactive_selection_allowed_get(const
Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *pd)
{
return pd->select_allow;
}
EOLIAN static void
-_efl_ui_internal_text_interactive_efl_ui_text_interactive_selection_cursors_get(const
Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *pd,
Efl_Text_Cursor_Cursor **start, Evas_Textblock_Cursor **end)
+_efl_ui_internal_text_interactive_efl_text_interactive_selection_cursors_get(const
Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *pd,
Efl_Text_Cursor_Cursor **start, Evas_Textblock_Cursor **end)
{
if (start) *start = pd->sel_start;
if (end) *end = pd->sel_end;
}
EOLIAN static void
-_efl_ui_internal_text_interactive_efl_ui_text_interactive_editable_set(Eo *obj
EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd, Eina_Bool editable)
+_efl_ui_internal_text_interactive_efl_text_interactive_editable_set(Eo *obj
EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd, Eina_Bool editable)
{
sd->editable = editable;
}
EOLIAN static Eina_Bool
-_efl_ui_internal_text_interactive_efl_ui_text_interactive_editable_get(const
Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd)
+_efl_ui_internal_text_interactive_efl_text_interactive_editable_get(const Eo
*obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *sd)
{
return sd->editable;
}
#include "efl_ui_internal_text_interactive.eo.c"
-#include "efl_ui_text_interactive.eo.c"
+#include "efl_text_interactive.eo.c"
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.eo
b/src/lib/elementary/efl_ui_internal_text_interactive.eo
index bf0bd65cb3..6910fa1d34 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.eo
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Internal.Text.Interactive (Efl.Canvas.Text,
Efl.Ui.Text.Interactive)
+class Efl.Ui.Internal.Text.Interactive (Efl.Canvas.Text, Efl.Text_Interactive)
{
[[An internal object in charge of the interactive aspect of the text widget.
@@ -7,8 +7,8 @@ class Efl.Ui.Internal.Text.Interactive (Efl.Canvas.Text,
Efl.Ui.Text.Interactive
implements {
Efl.Object.constructor;
Efl.Object.finalize;
- Efl.Ui.Text.Interactive.selection_allowed { get; set; }
- Efl.Ui.Text.Interactive.selection_cursors { get; }
- Efl.Ui.Text.Interactive.editable { get; set; }
+ Efl.Text_Interactive.selection_allowed { get; set; }
+ Efl.Text_Interactive.selection_cursors { get; }
+ Efl.Text_Interactive.editable { get; set; }
}
}
diff --git a/src/lib/elementary/efl_ui_layout.c
b/src/lib/elementary/efl_ui_layout.c
index 7b89dd1351..d2424833f9 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -2284,8 +2284,8 @@
ELM_PART_OVERRIDE_CONTENT_SET_FULL(efl_ui_layout_part_content, efl_ui_layout, EF
ELM_PART_OVERRIDE_CONTENT_UNSET_FULL(efl_ui_layout_part_content,
efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
/* Efl.Ui.Layout.Part_Text */
-ELM_PART_OVERRIDE_TEXT_GET_FULL(efl_ui_layout_part_text, efl_ui_layout,
EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
-ELM_PART_OVERRIDE_TEXT_SET_FULL(efl_ui_layout_part_text, efl_ui_layout,
EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
+ELM_PART_OVERRIDE_TEXT_TEXT_GET_FULL(efl_ui_layout_part_text, efl_ui_layout,
EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
+ELM_PART_OVERRIDE_TEXT_TEXT_SET_FULL(efl_ui_layout_part_text, efl_ui_layout,
EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(efl_ui_layout_part_text, efl_ui_layout,
EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
ELM_PART_OVERRIDE_TEXT_MARKUP_SET_FULL(efl_ui_layout_part_text, efl_ui_layout,
EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
@@ -2307,8 +2307,8 @@
_efl_ui_layout_part_text_efl_ui_translatable_translatable_text_set(Eo *obj, void
ELM_PART_OVERRIDE_CONTENT_GET_FULL(efl_ui_layout_part_legacy, efl_ui_layout,
EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
ELM_PART_OVERRIDE_CONTENT_SET_FULL(efl_ui_layout_part_legacy, efl_ui_layout,
EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET_FULL(efl_ui_layout_part_legacy, efl_ui_layout,
EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
-ELM_PART_OVERRIDE_TEXT_GET_FULL(efl_ui_layout_part_legacy, efl_ui_layout,
EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
-ELM_PART_OVERRIDE_TEXT_SET_FULL(efl_ui_layout_part_legacy, efl_ui_layout,
EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
+ELM_PART_OVERRIDE_TEXT_TEXT_GET_FULL(efl_ui_layout_part_legacy, efl_ui_layout,
EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
+ELM_PART_OVERRIDE_TEXT_TEXT_SET_FULL(efl_ui_layout_part_legacy, efl_ui_layout,
EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(efl_ui_layout_part_legacy,
efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
ELM_PART_OVERRIDE_TEXT_MARKUP_SET_FULL(efl_ui_layout_part_legacy,
efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
diff --git a/src/lib/elementary/efl_ui_layout_part_legacy.eo
b/src/lib/elementary/efl_ui_layout_part_legacy.eo
index bb0ba7bd61..8c7e2d3a43 100644
--- a/src/lib/elementary/efl_ui_layout_part_legacy.eo
+++ b/src/lib/elementary/efl_ui_layout_part_legacy.eo
@@ -1,5 +1,5 @@
class Efl.Ui.Layout.Part_Legacy (Efl.Ui.Layout.Part, Efl.Content, Efl.Text,
- Efl.Text.Markup, Efl.Ui.Translatable)
+ Efl.Text_Markup, Efl.Ui.Translatable)
{
[[Elementary layout internal part class]]
data: null;
@@ -7,7 +7,7 @@ class Efl.Ui.Layout.Part_Legacy (Efl.Ui.Layout.Part,
Efl.Content, Efl.Text,
Efl.Content.content { get; set; }
Efl.Content.content_unset;
Efl.Text.text { set; get; }
- Efl.Text.Markup.markup { get; set; }
+ Efl.Text_Markup.markup { get; set; }
Efl.Ui.Translatable.translatable_text { get; set; }
}
}
diff --git a/src/lib/elementary/efl_ui_layout_part_text.eo
b/src/lib/elementary/efl_ui_layout_part_text.eo
index 9dda607b21..82347b93ef 100644
--- a/src/lib/elementary/efl_ui_layout_part_text.eo
+++ b/src/lib/elementary/efl_ui_layout_part_text.eo
@@ -1,11 +1,11 @@
-class Efl.Ui.Layout.Part_Text (Efl.Ui.Layout.Part, Efl.Text, Efl.Text.Markup,
+class Efl.Ui.Layout.Part_Text (Efl.Ui.Layout.Part, Efl.Text, Efl.Text_Markup,
Efl.Ui.Translatable)
{
[[Elementary layout internal part class]]
data: null;
implements {
Efl.Text.text { set; get; }
- Efl.Text.Markup.markup { get; set; }
+ Efl.Text_Markup.markup { get; set; }
Efl.Ui.Translatable.translatable_text { get; set; }
}
}
diff --git a/src/lib/elementary/efl_ui_progressbar.eo
b/src/lib/elementary/efl_ui_progressbar.eo
index b2f033c5f1..45dd869d3f 100644
--- a/src/lib/elementary/efl_ui_progressbar.eo
+++ b/src/lib/elementary/efl_ui_progressbar.eo
@@ -1,6 +1,6 @@
class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format,
Efl.Ui.Direction, Efl.Access.Value,
Efl.Ui.Translatable,
- Efl.Text, Efl.Content, Efl.Text.Markup)
+ Efl.Text, Efl.Content, Efl.Text_Markup)
{
[[Elementary progressbar class]]
methods {
@@ -58,7 +58,7 @@ class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range,
Efl.Ui.Format,
Efl.Part.part;
Efl.Access.Value.value_and_text { get; }
Efl.Text.text { get; set; }
- Efl.Text.Markup.markup { get; set; }
+ Efl.Text_Markup.markup { get; set; }
Efl.Content.content { get; set; }
Efl.Content.content_unset;
Efl.Ui.Translatable.translatable_text { get; set; }
diff --git a/src/lib/elementary/efl_ui_slider.eo
b/src/lib/elementary/efl_ui_slider.eo
index e9a994590e..6cb34475d4 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -1,5 +1,5 @@
class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
- Efl.Access.Value, Efl.Text, Efl.Text.Markup,
Efl.Ui.Format,
+ Efl.Access.Value, Efl.Text, Efl.Text_Markup,
Efl.Ui.Format,
Efl.Ui.Translatable, Efl.Access.Widget.Action,
Efl.Content)
{
@@ -27,7 +27,7 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range,
Efl.Ui.Direction,
Efl.Access.Value.increment { get; }
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Text.text { get; set; }
- Efl.Text.Markup.markup { get; set; }
+ Efl.Text_Markup.markup { get; set; }
Efl.Ui.Format.format_cb { set; }
Efl.Ui.Translatable.translatable_text { get; set; }
Efl.Content.content { get; set; }
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 51330d461e..29a0120b24 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -581,7 +581,7 @@ _update_selection_handler(Eo *obj)
Eina_Bool hidden = EINA_FALSE;
Efl_Text_Cursor_Cursor *sel_start, *sel_end;
- efl_ui_text_interactive_selection_cursors_get(obj, &sel_start,
&sel_end);
+ efl_text_interactive_selection_cursors_get(obj, &sel_start, &sel_end);
if (!sd->start_handler)
_create_selection_handlers(obj, sd);
@@ -706,7 +706,7 @@ _selection_data_cb(void *data EINA_UNUSED,
else if (sd->cnp_mode == ELM_CNP_MODE_PLAINTEXT)
{
Efl_Text_Cursor_Cursor *cur, *start, *end;
- efl_ui_text_interactive_selection_cursors_get(obj, &start, &end);
+ efl_text_interactive_selection_cursors_get(obj, &start, &end);
if (!efl_text_cursor_equal(obj, start, end))
{
efl_canvas_text_range_delete(obj, start, end);
@@ -1452,7 +1452,7 @@ _selection_store(Elm_Sel_Type seltype,
EFL_UI_TEXT_DATA_GET(obj, sd);
- efl_ui_text_interactive_selection_cursors_get(obj, &start, &end);
+ efl_text_interactive_selection_cursors_get(obj, &start, &end);
sel = efl_canvas_text_range_text_get(obj, start, end);
if ((!sel) || (!sel[0])) return; /* avoid deleting our own selection */
@@ -1484,7 +1484,7 @@ _cut_cb(Eo *obj)
elm_widget_scroll_hold_pop(obj);
_selection_store(ELM_SEL_TYPE_CLIPBOARD, obj);
- efl_ui_text_interactive_selection_cursors_get(obj, &start, &end);
+ efl_text_interactive_selection_cursors_get(obj, &start, &end);
efl_canvas_text_range_delete(obj, start, end);
}
@@ -2745,7 +2745,7 @@ _start_handler_mouse_down_cb(void *data,
sd->start_handler_down = EINA_TRUE;
/* Get the cursors */
- efl_ui_text_interactive_selection_cursors_get(text_obj, &sel_start,
&sel_end);
+ efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end);
main_cur = efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_MAIN);
start_pos = efl_text_cursor_position_get(obj, sel_start);
@@ -2831,7 +2831,7 @@ _end_handler_mouse_down_cb(void *data,
Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
- efl_ui_text_interactive_selection_cursors_get(text_obj, &sel_start,
&sel_end);
+ efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end);
main_cur = efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_MAIN);
start_pos = efl_text_cursor_position_get(obj, sel_start);
@@ -3046,7 +3046,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj,
Efl_Ui_Text_Data *sd)
// For now, set this for easier setup
efl_text_font_set(text_obj, "Sans", 12);
efl_text_normal_color_set(text_obj, 255, 255, 255, 255);
- efl_ui_text_interactive_editable_set(obj, EINA_FALSE);
+ efl_text_interactive_editable_set(obj, EINA_FALSE);
sd->single_line = !efl_text_multiline_get(text_obj);
@@ -3059,7 +3059,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj,
Efl_Ui_Text_Data *sd)
_efl_ui_text_changed_user_cb, obj);
efl_event_callback_add(text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED,
_efl_ui_text_changed_cb, obj);
- efl_event_callback_add(text_obj,
EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED,
+ efl_event_callback_add(text_obj,
EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED,
_efl_ui_text_selection_changed_cb, obj);
efl_event_callback_add(text_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED,
_efl_ui_text_cursor_changed_cb, obj);
@@ -3278,7 +3278,7 @@ _efl_ui_text_efl_object_destructor(Eo *obj,
Efl_Ui_Text_Data *sd)
_efl_ui_text_changed_user_cb, obj);
efl_event_callback_del(text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED,
_efl_ui_text_changed_cb, obj);
- efl_event_callback_del(text_obj,
EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED,
+ efl_event_callback_del(text_obj,
EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED,
_efl_ui_text_selection_changed_cb, obj);
efl_event_callback_del(text_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED,
_efl_ui_text_cursor_changed_cb, obj);
@@ -3356,7 +3356,7 @@ _efl_ui_text_selection_get(const Eo *obj,
Efl_Ui_Text_Data *sd)
if ((sd->password)) return NULL;
- efl_ui_text_interactive_selection_cursors_get(obj, &start_obj, &end_obj);
+ efl_text_interactive_selection_cursors_get(obj, &start_obj, &end_obj);
return efl_canvas_text_range_text_get(obj, start_obj, end_obj);
}
@@ -3383,9 +3383,9 @@ _efl_ui_text_entry_insert(Eo *obj, Efl_Ui_Text_Data *sd,
const char *entry)
}
EOLIAN static void
-_efl_ui_text_efl_ui_text_interactive_editable_set(Eo *obj, Efl_Ui_Text_Data
*sd, Eina_Bool editable)
+_efl_ui_text_efl_text_interactive_editable_set(Eo *obj, Efl_Ui_Text_Data *sd,
Eina_Bool editable)
{
- efl_ui_text_interactive_editable_set(efl_super(obj, MY_CLASS), editable);
+ efl_text_interactive_editable_set(efl_super(obj, MY_CLASS), editable);
if (sd->editable == editable) return;
sd->editable = editable;
efl_ui_widget_theme_apply(obj);
@@ -3444,7 +3444,7 @@ _efl_ui_text_select_region_set(Eo *obj, Efl_Ui_Text_Data
*sd, int start, int end
if ((sd->password)) return;
- efl_ui_text_interactive_selection_cursors_get(obj, &sel_start, &sel_end);
+ efl_text_interactive_selection_cursors_get(obj, &sel_start, &sel_end);
efl_text_cursor_position_set(obj, sel_start, start);
efl_text_cursor_position_set(obj, sel_end, end);
@@ -4465,7 +4465,7 @@ _efl_ui_text_efl_access_object_state_set_get(const Eo
*obj, Efl_Ui_Text_Data *_p
Efl_Access_State_Set ret;
ret = efl_access_object_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS));
- if (efl_ui_text_interactive_editable_get(obj))
+ if (efl_text_interactive_editable_get(obj))
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE);
return ret;
@@ -4527,7 +4527,7 @@ _create_text_cursors(Eo *obj, Efl_Ui_Text_Data *sd)
sd->cursor = _decoration_create(obj, sd, PART_NAME_CURSOR, EINA_TRUE);
sd->cursor_bidi = _decoration_create(obj, sd, PART_NAME_CURSOR, EINA_TRUE);
- if (!efl_ui_text_interactive_editable_get(obj))
+ if (!efl_text_interactive_editable_get(obj))
{
evas_object_hide(sd->cursor);
evas_object_hide(sd->cursor_bidi);
@@ -4622,7 +4622,7 @@ _update_text_selection(Eo *obj, Eo *text_obj)
_decoration_calc_offset(sd, &x, &y);
- efl_ui_text_interactive_selection_cursors_get(text_obj, &sel_start,
&sel_end);
+ efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end);
range = efl_canvas_text_range_simple_geometry_get(text_obj,
sel_start, sel_end);
@@ -5200,7 +5200,7 @@ _efl_ui_text_selection_changed_cb(void *data, const
Efl_Event *event EINA_UNUSED
char *text;
EFL_UI_TEXT_DATA_GET(obj, sd);
- efl_ui_text_interactive_selection_cursors_get(obj, &start, &end);
+ efl_text_interactive_selection_cursors_get(obj, &start, &end);
text = efl_canvas_text_range_text_get(obj, start, end);
if (!text || (text[0] == '\0'))
@@ -5293,7 +5293,7 @@ _efl_ui_text_editable_efl_object_constructor(Eo *obj,
void *_pd EINA_UNUSED)
if (!elm_widget_theme_klass_get(obj))
elm_widget_theme_klass_set(obj, "text");
obj = efl_constructor(efl_super(obj, MY_CLASS));
- efl_ui_text_interactive_editable_set(obj, EINA_TRUE);
+ efl_text_interactive_editable_set(obj, EINA_TRUE);
return obj;
}
diff --git a/src/lib/elementary/efl_ui_text.eo
b/src/lib/elementary/efl_ui_text.eo
index 6897a1d970..7e8de1a79d 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -3,7 +3,7 @@ import elm_general;
class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
- Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Ui.Text.Interactive)
+ Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Text_Interactive)
{
[[Efl UI text class]]
methods {
@@ -316,7 +316,7 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable,
Efl.Ui.Clickable,
}
cursor_new {
[[Creates and returns a new cursor for the text.]]
- return: ptr(Efl.Text.Cursor.Cursor); [[Text cursor]]
+ return: ptr(Efl.Text_Cursor_Cursor); [[Text cursor]]
}
}
implements {
@@ -362,7 +362,7 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable,
Efl.Ui.Clickable,
Efl.Access.Editable.Text.delete;
Efl.Access.Editable.Text.paste;
Efl.File.file { get; set; }
- Efl.Ui.Text.Interactive.editable { set; }
+ Efl.Text_Interactive.editable { set; }
}
events {
activated; [[Called when entry is activated]]
diff --git a/src/lib/elementary/efl_ui_text_editable.eo
b/src/lib/elementary/efl_ui_text_editable.eo
index 0092aee29b..b0535b1e5d 100644
--- a/src/lib/elementary/efl_ui_text_editable.eo
+++ b/src/lib/elementary/efl_ui_text_editable.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Text.Editable (Efl.Ui.Text)
+class Efl.Ui.Text_Editable (Efl.Ui.Text)
{
[[Efl UI text editable class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_text_factory_emoticons.eo
b/src/lib/elementary/efl_ui_text_factory_emoticons.eo
index 6177cfb9d2..6cfcdbe23c 100644
--- a/src/lib/elementary/efl_ui_text_factory_emoticons.eo
+++ b/src/lib/elementary/efl_ui_text_factory_emoticons.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Text.Factory.Emoticons (Efl.Object, Efl.Canvas.Text_Factory)
+class Efl.Ui.Text_Factory.Emoticons (Efl.Object, Efl.Canvas.Text_Factory)
{
[[Factory that creates emoticons from the current theme given a key.
diff --git a/src/lib/elementary/efl_ui_text_factory_fallback.eo
b/src/lib/elementary/efl_ui_text_factory_fallback.eo
index cb88010808..03b339dce7 100644
--- a/src/lib/elementary/efl_ui_text_factory_fallback.eo
+++ b/src/lib/elementary/efl_ui_text_factory_fallback.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Text.Factory.Fallback (Efl.Object, Efl.Canvas.Text_Factory)
+class Efl.Ui.Text_Factory.Fallback (Efl.Object, Efl.Canvas.Text_Factory)
{
[[Internal factory for fallback cases.
diff --git a/src/lib/elementary/efl_ui_text_factory_images.eo
b/src/lib/elementary/efl_ui_text_factory_images.eo
index d0d44f48d0..012c3e1fad 100644
--- a/src/lib/elementary/efl_ui_text_factory_images.eo
+++ b/src/lib/elementary/efl_ui_text_factory_images.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Text.Factory.Images (Efl.Object, Efl.Canvas.Text_Factory)
+class Efl.Ui.Text_Factory.Images (Efl.Object, Efl.Canvas.Text_Factory)
{
[[Factory that creates images given key string
diff --git a/src/lib/elementary/elm_part_helper.h
b/src/lib/elementary/elm_part_helper.h
index 11297481b7..67d20ca4ea 100644
--- a/src/lib/elementary/elm_part_helper.h
+++ b/src/lib/elementary/elm_part_helper.h
@@ -117,7 +117,7 @@ _ ## full ## _efl_content_content_unset(Eo *obj, void *_pd
EINA_UNUSED) \
return _ ## type ## _content_unset(pd->obj, sd, pd->part); \
}
-#define ELM_PART_OVERRIDE_TEXT_SET_FULL(full, type, TYPE, typedata) \
+#define ELM_PART_OVERRIDE_TEXT_TEXT_SET_FULL(full, type, TYPE, typedata) \
EOLIAN static void \
_ ## full ## _efl_text_text_set(Eo *obj, void *_pd EINA_UNUSED, const char
*text) \
{ \
@@ -126,7 +126,7 @@ _ ## full ## _efl_text_text_set(Eo *obj, void *_pd
EINA_UNUSED, const char *text
_ ## type ## _text_set(pd->obj, sd, pd->part, text); \
}
-#define ELM_PART_OVERRIDE_TEXT_GET_FULL(full, type, TYPE, typedata) \
+#define ELM_PART_OVERRIDE_TEXT_TEXT_GET_FULL(full, type, TYPE, typedata) \
EOLIAN static const char *\
_ ## full ## _efl_text_text_get(const Eo *obj, void *_pd EINA_UNUSED) \
{ \
@@ -163,10 +163,10 @@ _ ## full ## _efl_text_markup_markup_set(Eo *obj, void
*_pd EINA_UNUSED, const c
ELM_PART_OVERRIDE_CONTENT_UNSET_FULL(type ## _part, type, TYPE, typedata)
#define ELM_PART_OVERRIDE_TEXT_SET(type, TYPE, typedata) \
- ELM_PART_OVERRIDE_TEXT_SET_FULL(type ## _part, type, TYPE, typedata)
+ ELM_PART_OVERRIDE_TEXT_TEXT_SET_FULL(type ## _part, type, TYPE, typedata)
#define ELM_PART_OVERRIDE_TEXT_GET(type, TYPE, typedata) \
- ELM_PART_OVERRIDE_TEXT_GET_FULL(type ## _part, type, TYPE, typedata)
+ ELM_PART_OVERRIDE_TEXT_TEXT_GET_FULL(type ## _part, type, TYPE, typedata)
#define ELM_PART_OVERRIDE_MARKUP_SET(type, TYPE, typedata) \
ELM_PART_OVERRIDE_TEXT_MARKUP_SET_FULL(type ## _part, type, TYPE, typedata)
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo
b/src/lib/evas/canvas/efl_canvas_text.eo
index 33f5dce659..49c1357834 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -3,9 +3,9 @@ import efl_text_types;
struct Efl.Canvas.Text_Style; [[EFL text style data structure]]
class Efl.Canvas.Text (Efl.Canvas.Object, 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.Ui.Base)
+ Efl.Canvas.Filter.Internal, Efl.Text_Font,
+ Efl.Text_Style, Efl.Text_Format, Efl.Text_Cursor,
+ Efl.Text_Annotate, Efl.Text_Markup, Efl.Ui.Base)
{
[[Efl canvas text class]]
legacy_prefix: evas_object_textblock;
@@ -33,8 +33,8 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
]]
return: bool; [[$true on success, $false otherwise]]
params {
- @in start: ptr(Efl.Text.Cursor.Cursor); [[Range start position]]
- @in end: ptr(Efl.Text.Cursor.Cursor); [[Range end position]]
+ @in start: ptr(Efl.Text_Cursor_Cursor); [[Range start position]]
+ @in end: ptr(Efl.Text_Cursor_Cursor); [[Range end position]]
}
}
@property style_insets {
@@ -163,8 +163,8 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
legacy: null;
return: mstring @owned; [[The text in the given range]]
params {
- @cref cur1: Efl.Text.Cursor.Cursor; [[Start of range]]
- @cref cur2: Efl.Text.Cursor.Cursor; [[End of range]]
+ @cref cur1: Efl.Text_Cursor_Cursor; [[Start of range]]
+ @cref cur2: Efl.Text_Cursor_Cursor; [[End of range]]
}
}
range_geometry_get {
@@ -177,8 +177,8 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
]]
legacy: null;
params {
- @cref cur1: Efl.Text.Cursor.Cursor; [[Start of range]]
- @cref cur2: Efl.Text.Cursor.Cursor; [[End of range]]
+ @cref cur1: Efl.Text_Cursor_Cursor; [[Start of range]]
+ @cref cur2: Efl.Text_Cursor_Cursor; [[End of range]]
}
return: iterator<ptr(Eina.Rect)> @owned; [[
Iterator on all geoemtries of the given range
@@ -195,8 +195,8 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
]]
legacy: null;
params {
- @cref cur1: Efl.Text.Cursor.Cursor; [[Start of range]]
- @cref cur2: Efl.Text.Cursor.Cursor; [[End of range]]
+ @cref cur1: Efl.Text_Cursor_Cursor; [[Start of range]]
+ @cref cur2: Efl.Text_Cursor_Cursor; [[End of range]]
}
return: iterator<ptr(Eina.Rect)> @owned; [[
Iterator on all simple geometries of the given range
@@ -209,8 +209,8 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
]]
legacy: null;
params {
- @in cur1: ptr(Efl.Text.Cursor.Cursor); [[Range start position]]
- @in cur2: ptr(Efl.Text.Cursor.Cursor); [[Range end position]]
+ @in cur1: ptr(Efl.Text_Cursor_Cursor); [[Range start position]]
+ @in cur2: ptr(Efl.Text_Cursor_Cursor); [[Range end position]]
}
}
// Obstacles
@@ -277,81 +277,81 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
Efl.Canvas.Filter.Internal.filter_dirty;
Efl.Canvas.Filter.Internal.filter_input_render;
Efl.Canvas.Filter.Internal.filter_state_prepare;
- Efl.Text.Font.font { get; set; }
- Efl.Text.Font.font_source { get; set; }
- Efl.Text.Font.font_fallbacks { get; set; }
- Efl.Text.Font.font_lang { get; set; }
- Efl.Text.Font.font_weight { get; set; }
- Efl.Text.Font.font_slant { get; set; }
- Efl.Text.Font.font_width { get; set; }
- Efl.Text.Font.font_bitmap_scalable { get; set; }
- Efl.Text.Style.normal_color { get; set; }
- Efl.Text.Style.backing_type { get; set; }
- Efl.Text.Style.backing_color { get; set; }
- Efl.Text.Style.underline_type { get; set; }
- Efl.Text.Style.underline_color { get; set; }
- Efl.Text.Style.underline_height { get; set; }
- Efl.Text.Style.underline_dashed_color { get; set; }
- Efl.Text.Style.underline_dashed_width { get; set; }
- Efl.Text.Style.underline_dashed_gap { get; set; }
- Efl.Text.Style.underline2_type { get; set; }
- Efl.Text.Style.underline2_color { get; set; }
- Efl.Text.Style.strikethrough_type { get; set; }
- Efl.Text.Style.strikethrough_color { get; set; }
- Efl.Text.Style.effect_type { get; set; }
- Efl.Text.Style.outline_color { get; set; }
- Efl.Text.Style.shadow_direction { get; set; }
- Efl.Text.Style.shadow_color { get; set; }
- Efl.Text.Style.glow_color { get; set; }
- Efl.Text.Style.glow2_color { get; set; }
- Efl.Text.Style.gfx_filter { get; set; }
- Efl.Text.Format.ellipsis { get; set; }
- Efl.Text.Format.wrap { get; set; }
- Efl.Text.Format.multiline { get; set; }
- Efl.Text.Format.halign { get; set; }
- Efl.Text.Format.halign_auto_type { get; set; }
- Efl.Text.Format.valign { get; set; }
- Efl.Text.Format.linegap { get; set; }
- Efl.Text.Format.linerelgap { get; set; }
- Efl.Text.Format.tabstops { get; set; }
- Efl.Text.Format.password { get; set; }
- Efl.Text.Format.replacement_char { get; set; }
- Efl.Text.Cursor.text_cursor { get; }
- Efl.Text.Cursor.cursor_position { set; get; }
- Efl.Text.Cursor.cursor_content { get; }
- Efl.Text.Cursor.cursor_geometry { get; }
- Efl.Text.Cursor.cursor_new;
- Efl.Text.Cursor.cursor_free;
- Efl.Text.Cursor.cursor_equal;
- Efl.Text.Cursor.cursor_compare;
- Efl.Text.Cursor.cursor_copy;
- Efl.Text.Cursor.cursor_char_next;
- Efl.Text.Cursor.cursor_char_prev;
- Efl.Text.Cursor.cursor_paragraph_char_first;
- Efl.Text.Cursor.cursor_paragraph_char_last;
- Efl.Text.Cursor.cursor_word_start;
- Efl.Text.Cursor.cursor_word_end;
- Efl.Text.Cursor.cursor_line_char_first;
- Efl.Text.Cursor.cursor_line_char_last;
- Efl.Text.Cursor.cursor_paragraph_first;
- Efl.Text.Cursor.cursor_paragraph_last;
- Efl.Text.Cursor.cursor_paragraph_next;
- Efl.Text.Cursor.cursor_paragraph_prev;
- Efl.Text.Cursor.cursor_line_jump_by;
- Efl.Text.Cursor.cursor_coord_set;
- Efl.Text.Cursor.cursor_text_insert;
- Efl.Text.Cursor.cursor_char_delete;
- Efl.Text.Annotate.annotation { set; get; }
- Efl.Text.Annotate.range_annotations_get;
- Efl.Text.Annotate.annotation_insert;
- Efl.Text.Annotate.annotation_del;
- Efl.Text.Annotate.annotation_is_item;
- Efl.Text.Annotate.item_geometry_get;
- Efl.Text.Annotate.annotation_positions_get;
- Efl.Text.Annotate.cursor_item_annotation { get; }
- Efl.Text.Annotate.cursor_item_insert;
- Efl.Text.Markup.markup { set; get; }
- Efl.Text.Markup.cursor_markup_insert;
+ Efl.Text_Font.font { get; set; }
+ Efl.Text_Font.font_source { get; set; }
+ Efl.Text_Font.font_fallbacks { get; set; }
+ Efl.Text_Font.font_lang { get; set; }
+ Efl.Text_Font.font_weight { get; set; }
+ Efl.Text_Font.font_slant { get; set; }
+ Efl.Text_Font.font_width { get; set; }
+ Efl.Text_Font.font_bitmap_scalable { get; set; }
+ Efl.Text_Style.normal_color { get; set; }
+ Efl.Text_Style.backing_type { get; set; }
+ Efl.Text_Style.backing_color { get; set; }
+ Efl.Text_Style.underline_type { get; set; }
+ Efl.Text_Style.underline_color { get; set; }
+ Efl.Text_Style.underline_height { get; set; }
+ Efl.Text_Style.underline_dashed_color { get; set; }
+ Efl.Text_Style.underline_dashed_width { get; set; }
+ Efl.Text_Style.underline_dashed_gap { get; set; }
+ Efl.Text_Style.underline2_type { get; set; }
+ Efl.Text_Style.underline2_color { get; set; }
+ Efl.Text_Style.strikethrough_type { get; set; }
+ Efl.Text_Style.strikethrough_color { get; set; }
+ Efl.Text_Style.effect_type { get; set; }
+ Efl.Text_Style.outline_color { get; set; }
+ Efl.Text_Style.shadow_direction { get; set; }
+ Efl.Text_Style.shadow_color { get; set; }
+ Efl.Text_Style.glow_color { get; set; }
+ Efl.Text_Style.glow2_color { get; set; }
+ Efl.Text_Style.gfx_filter { get; set; }
+ Efl.Text_Format.ellipsis { get; set; }
+ Efl.Text_Format.wrap { get; set; }
+ Efl.Text_Format.multiline { get; set; }
+ Efl.Text_Format.halign { get; set; }
+ Efl.Text_Format.halign_auto_type { get; set; }
+ Efl.Text_Format.valign { get; set; }
+ Efl.Text_Format.linegap { get; set; }
+ Efl.Text_Format.linerelgap { get; set; }
+ Efl.Text_Format.tabstops { get; set; }
+ Efl.Text_Format.password { get; set; }
+ Efl.Text_Format.replacement_char { get; set; }
+ Efl.Text_Cursor.text_cursor { get; }
+ Efl.Text_Cursor.cursor_position { set; get; }
+ Efl.Text_Cursor.cursor_content { get; }
+ Efl.Text_Cursor.cursor_geometry { get; }
+ Efl.Text_Cursor.cursor_new;
+ Efl.Text_Cursor.cursor_free;
+ Efl.Text_Cursor.cursor_equal;
+ Efl.Text_Cursor.cursor_compare;
+ Efl.Text_Cursor.cursor_copy;
+ Efl.Text_Cursor.cursor_char_next;
+ Efl.Text_Cursor.cursor_char_prev;
+ Efl.Text_Cursor.cursor_paragraph_char_first;
+ Efl.Text_Cursor.cursor_paragraph_char_last;
+ Efl.Text_Cursor.cursor_word_start;
+ Efl.Text_Cursor.cursor_word_end;
+ Efl.Text_Cursor.cursor_line_char_first;
+ Efl.Text_Cursor.cursor_line_char_last;
+ Efl.Text_Cursor.cursor_paragraph_first;
+ Efl.Text_Cursor.cursor_paragraph_last;
+ Efl.Text_Cursor.cursor_paragraph_next;
+ Efl.Text_Cursor.cursor_paragraph_prev;
+ Efl.Text_Cursor.cursor_line_jump_by;
+ Efl.Text_Cursor.cursor_coord_set;
+ Efl.Text_Cursor.cursor_text_insert;
+ Efl.Text_Cursor.cursor_char_delete;
+ Efl.Text_Annotate.annotation { set; get; }
+ Efl.Text_Annotate.range_annotations_get;
+ Efl.Text_Annotate.annotation_insert;
+ Efl.Text_Annotate.annotation_del;
+ Efl.Text_Annotate.annotation_is_item;
+ Efl.Text_Annotate.item_geometry_get;
+ Efl.Text_Annotate.annotation_positions_get;
+ Efl.Text_Annotate.cursor_item_annotation { get; }
+ Efl.Text_Annotate.cursor_item_insert;
+ Efl.Text_Markup.markup { set; get; }
+ Efl.Text_Markup.cursor_markup_insert;
Efl.Gfx.Entity.scale { set; }
}
events {
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index 7f5fa9c0f2..ce6e60edd8 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -11512,7 +11512,7 @@ evas_textblock_cursor_geometry_bidi_get(const
Efl_Text_Cursor_Cursor *cur, Evas_
}
EOLIAN static Eina_Bool
-_efl_canvas_text_efl_text_cursor_cursor_geometry_get(const Eo *eo_obj
EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const Efl_Text_Cursor_Cursor
*cur, Efl_Text_Cursor_Cursor_Type ctype, Evas_Coord *cx, Evas_Coord *cy,
Evas_Coord *cw, Evas_Coord *ch, Evas_Coord *cx2, Evas_Coord *cy2, Evas_Coord
*cw2, Evas_Coord *ch2)
+_efl_canvas_text_efl_text_cursor_cursor_geometry_get(const Eo *eo_obj
EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const Efl_Text_Cursor_Cursor
*cur, Efl_Text_Cursor_Type ctype, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord
*cw, Evas_Coord *ch, Evas_Coord *cx2, Evas_Coord *cy2, Evas_Coord *cw2,
Evas_Coord *ch2)
{
ASYNC_BLOCK;
if (!cur) return EINA_FALSE;
@@ -16132,7 +16132,7 @@ ppar(Evas_Object_Textblock_Paragraph *par)
EFL_OBJECT_OP_FUNC(efl_dbg_info_get,
_efl_canvas_text_efl_object_dbg_info_get)
EOLIAN static Efl_Text_Cursor_Cursor *
-_efl_canvas_text_efl_text_cursor_text_cursor_get(const Eo *eo_obj EINA_UNUSED,
Efl_Canvas_Text_Data *o, Efl_Text_Cursor_Cursor_Get_Type get_type)
+_efl_canvas_text_efl_text_cursor_text_cursor_get(const Eo *eo_obj EINA_UNUSED,
Efl_Canvas_Text_Data *o, Efl_Text_Cursor_Get_Type get_type)
{
if (get_type > EFL_TEXT_CURSOR_GET_MAIN)
{
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 8825aa9f72..332a0412c8 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -1,7 +1,7 @@
type @extern Evas.Text_Style_Type : __undefined_type; [[External text style
type]]
class Evas.Text (Efl.Canvas.Object, Efl.Text,
- Efl.Text.Font, Efl.Canvas.Filter.Internal, Efl.Ui.Base)
+ Efl.Text_Font, Efl.Canvas.Filter.Internal, Efl.Ui.Base)
{
[[Evas text class]]
legacy_prefix: evas_object_text;
@@ -274,9 +274,9 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text,
Efl.Gfx.Entity.size { set; }
Efl.Gfx.Entity.scale { set; }
Efl.Text.text { get; set; }
- Efl.Text.Font.font { get; set; }
- Efl.Text.Font.font_source { get; set; }
- Efl.Text.Font.font_bitmap_scalable { get; set; }
+ Efl.Text_Font.font { get; set; }
+ Efl.Text_Font.font_source { get; set; }
+ Efl.Text_Font.font_bitmap_scalable { get; set; }
Efl.Gfx.Filter.filter_program { set; }
Efl.Canvas.Filter.Internal.filter_dirty;
Efl.Canvas.Filter.Internal.filter_input_alpha;
diff --git a/src/lib/evas/canvas/evas_textgrid.eo
b/src/lib/evas/canvas/evas_textgrid.eo
index adb113759c..53e4d017e1 100644
--- a/src/lib/evas/canvas/evas_textgrid.eo
+++ b/src/lib/evas/canvas/evas_textgrid.eo
@@ -20,7 +20,7 @@ enum Evas.Textgrid.Font_Style {
/* XXX: Actual definition is in C. */
struct Evas.Textgrid.Cell; [[Evas textgrid cell data structure]]
-class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Font,
+class Evas.Textgrid (Efl.Canvas.Object, Efl.Text_Font,
Efl.Ui.Base)
{
[[Evas textgrid class]]
@@ -77,7 +77,7 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Font,
$width and $height can be $null. On error, they are
set to 0.
- See also @Efl.Text.Font.font.set and @.supported_font_styles.set
+ See also @Efl.Text_Font.font.set and @.supported_font_styles.set
@since 1.7]]
}
@@ -201,9 +201,9 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Font,
implements {
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Text.Font.font { get; set; }
- Efl.Text.Font.font_source { get; set; }
- Efl.Text.Font.font_bitmap_scalable { get; set; }
+ Efl.Text_Font.font { get; set; }
+ Efl.Text_Font.font_source { get; set; }
+ Efl.Text_Font.font_bitmap_scalable { get; set; }
Efl.Gfx.Entity.scale { set; }
}
}
--
