Edje part text: move 'item' to legacy

Is replaced with "annotation" logic.

  - part_text_item_geometry
  - part_text_item_list

4 files changed, 66 insertions, 60 deletions

diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index 6d9020ad80..c06053c7b3 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -1662,6 +1662,37 @@ EAPI void edje_object_part_text_style_user_push(Edje_Object *obj, const char *pa
 EAPI void edje_object_part_text_style_user_pop(Edje_Object *obj, const char *part);
 
 /**
+ * @brief Returns item geometry.
+ *
+ * This function return a list of Evas_Textblock_Rectangle item rectangles.
+ *
+ * @param[in] part The part name
+ * @param[in] item The item name
+ * @param[out] cx Item x return (relative to entry part)
+ * @param[out] cy Item y return (relative to entry part)
+ * @param[out] cw Item width return
+ * @param[out] ch Item height return
+ *
+ * @return $1 if item exists, $0 if not
+ *
+ * @ingroup Edje_Object
+ */
+EAPI Eina_Bool edje_object_part_text_item_geometry_get(const Edje_Object *obj, const char * part, const char * item, int *cx, int *cy, int *cw, int *ch);
+
+/**
+ * @brief Returns a list of char item names.
+ *
+ * This function returns a list of char item names.
+ *
+ * @param[in] part The part name
+ *
+ * @return The list of items (const char *), do not modify!
+ *
+ * @ingroup Edje_Object
+ */
+EAPI const Eina_List *edje_object_part_text_item_list_get(const Edje_Object *obj, const char * part);
+
+/**
  * @}
  */
 #include "edje_object.eo.legacy.h"
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index c42dd63a7c..5b11f5dc49 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -478,3 +478,38 @@ edje_object_part_text_style_user_peek(const Eo *obj EINA_UNUSED, const char *par
    return NULL;
 }
 
+EAPI const Eina_List *
+edje_object_part_text_item_list_get(const Eo *obj EINA_UNUSED, const char *part)
+{
+   Edje_Real_Part *rp;
+   Edje *ed;
+
+   ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS);
+
+   if ((!ed) || (!part)) return NULL;
+   rp = _edje_real_part_recursive_get(&ed, part);
+   if (!rp) return NULL;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     return _edje_entry_items_list(rp);
+
+   return NULL;
+}
+
+EOLIAN Eina_Bool
+edje_object_part_text_item_geometry_get(const Eo *obj EINA_UNUSED, const char *part, const char *item, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
+{
+   Edje_Real_Part *rp;
+   Edje *ed;
+
+   ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS);
+
+   if ((!ed) || (!part)) return EINA_FALSE;
+   rp = _edje_real_part_recursive_get(&ed, part);
+   if (!rp) return EINA_FALSE;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     {
+        return _edje_entry_item_geometry_get(rp, item, cx, cy, cw, ch);
+     }
+
+   return EINA_FALSE;
+}
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index fb96149e4a..1e0d120314 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -1349,36 +1349,6 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
             @in data: void_ptr; [[The data passed to the callback function]]
          }
       }
-      @property part_text_item_geometry {
-         get {
-            [[Returns item geometry.
-
-              This function return a list of Evas_Textblock_Rectangle item
-              rectangles.]]
-            return: bool; [[$1 if item exists, $0 if not]]
-         }
-         keys {
-            part: string; [[The part name]]
-            item: string; [[The item name]]
-         }
-         values {
-            cx: int; [[Item x return (relative to entry part)]]
-            cy: int; [[Item y return (relative to entry part)]]
-            cw: int; [[Item width return]]
-            ch: int; [[Item height return]]
-         }
-      }
-      @property part_text_item_list {
-         get {
-            [[Returns a list of char item names.
-
-              This function returns a list of char item names.]]
-            return: const(list<string>); [[The list of items (const char *), do not modify!]]
-         }
-         keys {
-            part: string; [[The part name]]
-         }
-      }
       /* TEXT PART APIS END ------------------------------------------------ */
 
       @property seat {
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index d7cecbd36c..6556ec6bfb 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -2335,36 +2335,6 @@ _edje_object_part_text_append(Eo *obj, Edje *ed, const char *part, const char *t
      ed->text_change.func(ed->text_change.data, obj, part);
 }
 
-EOLIAN const Eina_List *
-_edje_object_part_text_item_list_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part)
-{
-   Edje_Real_Part *rp;
-
-   if ((!ed) || (!part)) return NULL;
-   rp = _edje_real_part_recursive_get(&ed, part);
-   if (!rp) return NULL;
-   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
-     return _edje_entry_items_list(rp);
-
-   return NULL;
-}
-
-EOLIAN Eina_Bool
-_edje_object_part_text_item_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const char *item, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
-{
-   Edje_Real_Part *rp;
-
-   if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(&ed, part);
-   if (!rp) return EINA_FALSE;
-   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
-     {
-        return _edje_entry_item_geometry_get(rp, item, cx, cy, cw, ch);
-     }
-
-   return EINA_FALSE;
-}
-
 EOLIAN void
 _edje_object_part_text_cursor_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
 {