summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hirt <daniel.hirt@samsung.com>2016-11-17 16:59:57 +0200
committerDaniel Hirt <daniel.hirt@samsung.com>2016-11-17 16:59:57 +0200
commit9c1455bd55672ed006a0973e86ecf163ed877b60 (patch)
tree46142dd36b904eecc86b71af279d377b42df0fc5
parent1606f1bbe606dabb1b344ac8b58499b3c37c50c5 (diff)
downloadefl-9c1455bd55672ed006a0973e86ecf163ed877b60.tar.gz
Edje object: move more entry-specific api to legacydevs/herdsman/edje_efl_part_efl_text
-rw-r--r--src/lib/edje/Edje_Legacy.h39
-rw-r--r--src/lib/edje/edje_object.eo40
-rw-r--r--src/lib/edje/edje_util.c28
3 files changed, 59 insertions, 48 deletions
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index 5008f210f6..7b0681252c 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -698,5 +698,44 @@ EAPI const Eina_List *edje_object_part_text_item_list_get(Eo *obj, const char *p
*/
EAPI Eina_Bool edje_object_part_text_item_geometry_get(Eo *obj, const char *part, const char *item, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
+/*
+ * @brief Moves the cursor to the beginning of the text part
+ *
+ * @param[in] part The part name
+ * @param[in] cursor The cursor type
+ *
+ * @ref evas_textblock_cursor_paragraph_first
+ */
+EAPI void edje_object_part_text_cursor_begin_set(Eo *obj EINA_UNUSED, const char *part, Edje_Cursor cur);
+
+/*
+ * @brief Moves the cursor to the end of the text part
+ *
+ * @param[in] part The part name
+ * @param[in] cursor The cursor type
+ *
+ * @ref evas_textblock_cursor_paragraph_last
+ */
+EAPI void edje_object_part_text_cursor_end_set(Eo *obj EINA_UNUSED, const char *part, Edje_Cursor cur);
+
+/*
+ * @brief Moves the cursor to the beginning of the line in the text part
+ *
+ * @param[in] part The part name
+ * @param[in] cursor The cursor type
+ *
+ * @ref evas_textblock_cursor_paragraph_line_char_first
+ */
+EAPI void edje_object_part_text_cursor_line_begin_set(Eo *obj EINA_UNUSED, const char *part, Edje_Cursor cur);
+
+/*
+ * @brief Moves the cursor to the end of the line in the text part
+ *
+ * @param[in] part The part name
+ * @param[in] cursor The cursor type
+ *
+ * @ref evas_textblock_cursor_paragraph_line_char_last
+ */
+EAPI void edje_object_part_text_cursor_line_end_set(Eo *obj EINA_UNUSED, const char *part, Edje_Cursor cur);
#include "edje_object.eo.legacy.h"
#include "edje_edit.eo.legacy.h"
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 81c214f5a0..548c162964 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -1313,46 +1313,6 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
}
return: bool; [[$true if the visible character is hidden. $false if there is no visible character or the object is not set for password mode.]]
}
- @property part_text_cursor_begin {
- set {
- [[Moves the cursor to the beginning of the text part
- \@ref evas_textblock_cursor_paragraph_first]]
- }
- values {
- part: string; [[The part name]]
- cur: Edje.Cursor; [[The edje cursor to work on]]
- }
- }
- @property part_text_cursor_end {
- set {
- [[Moves the cursor to the end of the text part.
- \@ref evas_textblock_cursor_paragraph_last]]
- }
- values {
- part: string; [[The part name]]
- cur: Edje.Cursor; [[The edje cursor to work on]]
- }
- }
- @property part_text_cursor_line_begin {
- set {
- [[Move the cursor to the beginning of the line.
- \@ref evas_textblock_cursor_line_char_first]]
- }
- values {
- part: string; [[The part name]]
- cur: Edje.Cursor; [[The edje cursor to work on]]
- }
- }
- @property part_text_cursor_line_end {
- set {
- [[Move the cursor to the end of the line.
- \@ref evas_textblock_cursor_line_char_last]]
- }
- values {
- part: string; [[The part name]]
- cur: Edje.Cursor; [[The edje cursor to work on]]
- }
- }
part_text_cursor_prev {
[[Moves the cursor to the previous char
\@ref evas_textblock_cursor_char_prev]]
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index be9a23d19c..e46539ce93 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -2668,10 +2668,13 @@ _edje_object_part_text_cursor_down(Eo *obj EINA_UNUSED, Edje *ed, const char *pa
return EINA_FALSE;
}
-EOLIAN void
-_edje_object_part_text_cursor_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur)
+EAPI void
+edje_object_part_text_cursor_begin_set(Eo *obj EINA_UNUSED, const char *part, Edje_Cursor cur)
{
Edje_Real_Part *rp;
+ Edje *ed;
+
+ ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS);
if ((!ed) || (!part)) return;
rp = _edje_real_part_recursive_get(&ed, part);
@@ -2682,10 +2685,13 @@ _edje_object_part_text_cursor_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const cha
}
}
-EOLIAN void
-_edje_object_part_text_cursor_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur)
+EAPI void
+edje_object_part_text_cursor_end_set(Eo *obj EINA_UNUSED, const char *part, Edje_Cursor cur)
{
Edje_Real_Part *rp;
+ Edje *ed;
+
+ ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS);
if ((!ed) || (!part)) return;
rp = _edje_real_part_recursive_get(&ed, part);
@@ -2710,10 +2716,13 @@ _edje_object_part_text_cursor_copy(Eo *obj EINA_UNUSED, Edje *ed, const char *pa
}
}
-EOLIAN void
-_edje_object_part_text_cursor_line_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur)
+EAPI void
+edje_object_part_text_cursor_line_begin_set(Eo *obj EINA_UNUSED, const char *part, Edje_Cursor cur)
{
Edje_Real_Part *rp;
+ Edje *ed;
+
+ ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS);
if ((!ed) || (!part)) return;
rp = _edje_real_part_recursive_get(&ed, part);
@@ -2724,10 +2733,13 @@ _edje_object_part_text_cursor_line_begin_set(Eo *obj EINA_UNUSED, Edje *ed, cons
}
}
-EOLIAN void
-_edje_object_part_text_cursor_line_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur)
+EAPI void
+edje_object_part_text_cursor_line_end_set(Eo *obj EINA_UNUSED, const char *part, Edje_Cursor cur)
{
Edje_Real_Part *rp;
+ Edje *ed;
+
+ ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS);
if ((!ed) || (!part)) return;
rp = _edje_real_part_recursive_get(&ed, part);