diff options
author | Daniel Hirt <hirt.danny@gmail.com> | 2017-06-11 16:38:52 +0300 |
---|---|---|
committer | Daniel Hirt <hirt.danny@gmail.com> | 2017-06-11 16:39:37 +0300 |
commit | 5a1bddc556270288fc9d7c9df699c98879979947 (patch) | |
tree | 66ec56010faff96208c5141bfb10a631d2bf2521 | |
parent | 2b47a5863f13918565d1d890db64612dc4a6f28d (diff) | |
download | efl-5a1bddc556270288fc9d7c9df699c98879979947.tar.gz |
Edje part text: move anchor to legacy
- part_text_anchor_geometry
- part_text_anchor_list
-rw-r--r-- | src/lib/edje/Edje_Legacy.h | 28 | ||||
-rw-r--r-- | src/lib/edje/edje_legacy.c | 34 | ||||
-rw-r--r-- | src/lib/edje/edje_object.eo | 25 | ||||
-rw-r--r-- | src/lib/edje/edje_util.c | 28 |
4 files changed, 62 insertions, 53 deletions
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h index 1e238f17d2..2091aa4df1 100644 --- a/src/lib/edje/Edje_Legacy.h +++ b/src/lib/edje/Edje_Legacy.h @@ -1594,6 +1594,34 @@ EAPI Eina_Bool edje_object_part_text_cursor_is_format_get(Edje_Object *obj, cons EAPI Eina_Bool edje_object_part_text_cursor_is_visible_format_get(Edje_Object *obj, const char * part, Edje_Cursor cur); /** + * @brief Returns a list of Evas_Textblock_Rectangle anchor rectangles. + * + * This function return a list of Evas_Textblock_Rectangle anchor rectangles. + * + * @param[in] part The part name + * @param[in] anchor The anchor name + * + * @return The list of anchor rects (const Evas_Textblock_Rectangle *), do not + * modify! Geometry is relative to entry part. + * + * @ingroup Edje_Object + */ +EAPI const Eina_List *edje_object_part_text_anchor_geometry_get(Edje_Object *obj, const char * part, const char * anchor); + +/** + * @brief Returns a list of char anchor names. + * + * This function returns a list of char anchor names. + * + * @param[in] part The part name + * + * @return The list of anchors (const char *), do not modify! + * + * @ingroup Edje_Object + */ +EAPI const Eina_List *edje_object_part_text_anchor_list_get(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 cabe77431c..09e47542e2 100644 --- a/src/lib/edje/edje_legacy.c +++ b/src/lib/edje/edje_legacy.c @@ -377,3 +377,37 @@ edje_object_part_text_cursor_is_visible_format_get(Eo *obj EINA_UNUSED, const ch return EINA_FALSE; } +EAPI const Eina_List * +edje_object_part_text_anchor_list_get(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_anchors_list(rp); + + return NULL; +} + +EAPI const Eina_List * +edje_object_part_text_anchor_geometry_get(Eo *obj EINA_UNUSED, const char *part, const char *anchor) +{ + 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_anchor_geometry_get(rp, anchor); + + return NULL; +} + diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo index 86061c4049..a932c7a0d4 100644 --- a/src/lib/edje/edje_object.eo +++ b/src/lib/edje/edje_object.eo @@ -1249,31 +1249,6 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part, ondemand: bool; [[If $true, the input panel will be shown in case of only Mouse up event. (Focus event will be ignored.)]] } } - @property part_text_anchor_geometry { - get { - [[Returns a list of Evas_Textblock_Rectangle anchor rectangles. - - This function return a list of Evas_Textblock_Rectangle anchor - rectangles.]] - return: const(list<ptr(const(Evas.Textblock_Rectangle))>); [[The list of anchor rects (const Evas_Textblock_Rectangle - *), do not modify! Geometry is relative to entry part.]] - } - keys { - part: string; [[The part name]] - anchor: string; [[The anchor name]] - } - } - @property part_text_anchor_list { - get { - [[Returns a list of char anchor names. - - This function returns a list of char anchor names.]] - return: const(list<string>); [[The list of anchors (const char *), do not modify!]] - } - keys { - part: string; [[The part name]] - } - } text_insert_filter_callback_add { [[Adds a filter function for newly inserted text. diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index a349bb36a4..2ff840a4f3 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -2394,34 +2394,6 @@ _edje_object_part_text_append(Eo *obj, Edje *ed, const char *part, const char *t } EOLIAN const Eina_List * -_edje_object_part_text_anchor_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_anchors_list(rp); - - return NULL; -} - -EOLIAN const Eina_List * -_edje_object_part_text_anchor_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const char *anchor) -{ - 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_anchor_geometry_get(rp, anchor); - - return NULL; -} - -EOLIAN const Eina_List * _edje_object_part_text_item_list_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; |