summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-01-28 11:10:40 -0500
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-01-30 13:32:04 +0100
commit9aca866fd13bf6e571b4ebfd1a4c219cfce7703e (patch)
tree2fc6d6a892858483b00ccac4891a52df2fcf91d8 /src/lib/edje
parent31794a18e108fb2863eb8a170cc2064a12ba2c3d (diff)
efl.text_markup: move cursor-related methods to efl.text_markup_interactive
many users of the markup property are not interactive text cases, so splitting off the interactive methods resolves a number of unimplemented method issues ref T5719 Differential Revision: https://phab.enlightenment.org/D7787
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_part_invalid.c2
-rw-r--r--src/lib/edje/edje_part_text.c2
-rw-r--r--src/lib/edje/efl_canvas_layout_part_invalid.eo4
-rw-r--r--src/lib/edje/efl_canvas_layout_part_text.eo4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/edje/edje_part_invalid.c b/src/lib/edje/edje_part_invalid.c
index 469de82fd4..3e508b3fe0 100644
--- a/src/lib/edje/edje_part_invalid.c
+++ b/src/lib/edje/edje_part_invalid.c
@@ -71,7 +71,7 @@ EDJE_PART_INVALID_VOID(efl_text_cursor_line_jump_by, _efl_canvas_layout_part_inv
71EDJE_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) 71EDJE_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)
72EDJE_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) 72EDJE_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)
73EDJE_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) 73EDJE_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)
74EDJE_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) 74EDJE_PART_INVALID_VOID(efl_text_markup_interactive_cursor_markup_insert, _efl_canvas_layout_part_invalid_efl_text_markup_interactive_cursor_markup_insert, Efl_Text_Cursor_Cursor *cur, const char *markup)
75EDJE_PART_INVALID(Eina_Iterator *, 0, efl_content_iterate, _efl_canvas_layout_part_invalid_efl_container_content_iterate) 75EDJE_PART_INVALID(Eina_Iterator *, 0, efl_content_iterate, _efl_canvas_layout_part_invalid_efl_container_content_iterate)
76EDJE_PART_INVALID(int, 0, efl_content_count, _efl_canvas_layout_part_invalid_efl_container_content_count) 76EDJE_PART_INVALID(int, 0, efl_content_count, _efl_canvas_layout_part_invalid_efl_container_content_count)
77EDJE_PART_INVALID(Eina_Bool, 0, efl_content_remove, _efl_canvas_layout_part_invalid_efl_container_content_remove, Efl_Gfx_Entity *content) 77EDJE_PART_INVALID(Eina_Bool, 0, efl_content_remove, _efl_canvas_layout_part_invalid_efl_container_content_remove, Efl_Gfx_Entity *content)
diff --git a/src/lib/edje/edje_part_text.c b/src/lib/edje/edje_part_text.c
index 31678a3697..9143ef17aa 100644
--- a/src/lib/edje/edje_part_text.c
+++ b/src/lib/edje/edje_part_text.c
@@ -187,7 +187,7 @@ _efl_canvas_layout_part_text_efl_text_cursor_cursor_geometry_get(const Eo *obj,
187} 187}
188 188
189EOLIAN static void 189EOLIAN static void
190_efl_canvas_layout_part_text_efl_text_markup_cursor_markup_insert(Eo *obj, 190_efl_canvas_layout_part_text_efl_text_markup_interactive_cursor_markup_insert(Eo *obj,
191 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED, 191 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
192 const char *text) 192 const char *text)
193{ 193{
diff --git a/src/lib/edje/efl_canvas_layout_part_invalid.eo b/src/lib/edje/efl_canvas_layout_part_invalid.eo
index 6c8f3fee5d..1dbef9ffe2 100644
--- a/src/lib/edje/efl_canvas_layout_part_invalid.eo
+++ b/src/lib/edje/efl_canvas_layout_part_invalid.eo
@@ -1,7 +1,7 @@
1class Efl.Canvas.Layout_Part_Invalid extends Efl.Canvas.Layout_Part implements Efl.Content, 1class Efl.Canvas.Layout_Part_Invalid extends Efl.Canvas.Layout_Part implements Efl.Content,
2 Efl.Pack_Linear, Efl.Ui.Direction_Readonly, 2 Efl.Pack_Linear, Efl.Ui.Direction_Readonly,
3 Efl.Pack_Table, Efl.Text, 3 Efl.Pack_Table, Efl.Text,
4 Efl.Text_Markup 4 Efl.Text_Markup, Efl.Text_Markup_Interactive
5{ 5{
6 [[Common class for part proxy objects for @Efl.Canvas.Layout. 6 [[Common class for part proxy objects for @Efl.Canvas.Layout.
7 7
@@ -31,6 +31,7 @@ class Efl.Canvas.Layout_Part_Invalid extends Efl.Canvas.Layout_Part implements E
31 // Efl.Canvas.Layout_Part_Text 31 // Efl.Canvas.Layout_Part_Text
32 Efl.Text.text { set; get; } 32 Efl.Text.text { set; get; }
33 Efl.Text_Markup.markup { get; set; } 33 Efl.Text_Markup.markup { get; set; }
34 Efl.Text_Markup_Interactive.cursor_markup_insert;
34 Efl.Text_Cursor.text_cursor { get; } 35 Efl.Text_Cursor.text_cursor { get; }
35 Efl.Text_Cursor.cursor_paragraph_first; 36 Efl.Text_Cursor.cursor_paragraph_first;
36 Efl.Text_Cursor.cursor_paragraph_last; 37 Efl.Text_Cursor.cursor_paragraph_last;
@@ -44,7 +45,6 @@ class Efl.Canvas.Layout_Part_Invalid extends Efl.Canvas.Layout_Part implements E
44 Efl.Text_Cursor.cursor_copy; 45 Efl.Text_Cursor.cursor_copy;
45 Efl.Text_Cursor.cursor_content { get; } 46 Efl.Text_Cursor.cursor_content { get; }
46 Efl.Text_Cursor.cursor_geometry { get; } 47 Efl.Text_Cursor.cursor_geometry { get; }
47 Efl.Text_Markup.cursor_markup_insert;
48 // Efl.Canvas.Layout_Part_Box 48 // Efl.Canvas.Layout_Part_Box
49 Efl.Container.content_iterate; 49 Efl.Container.content_iterate;
50 Efl.Container.content_count; 50 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 0546118c73..b987c915e7 100644
--- a/src/lib/edje/efl_canvas_layout_part_text.eo
+++ b/src/lib/edje/efl_canvas_layout_part_text.eo
@@ -11,7 +11,7 @@ enum Efl.Canvas.Layout_Part_Text_Expand
11} 11}
12 12
13class Efl.Canvas.Layout_Part_Text extends Efl.Canvas.Layout_Part implements Efl.Text, 13class Efl.Canvas.Layout_Part_Text extends Efl.Canvas.Layout_Part implements Efl.Text,
14Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style 14Efl.Text_Markup, Efl.Text_Markup_Interactive, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style
15{ 15{
16 [[Represents a TEXT part of a layout 16 [[Represents a TEXT part of a layout
17 17
@@ -36,6 +36,7 @@ Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style
36 implements { 36 implements {
37 Efl.Text.text { set; get; } 37 Efl.Text.text { set; get; }
38 Efl.Text_Markup.markup { get; set; } 38 Efl.Text_Markup.markup { get; set; }
39 Efl.Text_Markup_Interactive.cursor_markup_insert;
39 Efl.Text_Cursor.text_cursor { get; } 40 Efl.Text_Cursor.text_cursor { get; }
40 Efl.Text_Cursor.cursor_paragraph_first; 41 Efl.Text_Cursor.cursor_paragraph_first;
41 Efl.Text_Cursor.cursor_paragraph_last; 42 Efl.Text_Cursor.cursor_paragraph_last;
@@ -49,7 +50,6 @@ Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style
49 Efl.Text_Cursor.cursor_copy; 50 Efl.Text_Cursor.cursor_copy;
50 Efl.Text_Cursor.cursor_content { get; } 51 Efl.Text_Cursor.cursor_content { get; }
51 Efl.Text_Cursor.cursor_geometry { get; } 52 Efl.Text_Cursor.cursor_geometry { get; }
52 Efl.Text_Markup.cursor_markup_insert;
53 Efl.Text_Format.ellipsis { set; get; } 53 Efl.Text_Format.ellipsis { set; get; }
54 Efl.Text_Format.wrap { set; get; } 54 Efl.Text_Format.wrap { set; get; }
55 Efl.Text_Font.font { set; get; } 55 Efl.Text_Font.font { set; get; }