discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=63bd856fdd86802f7c17348a3ea24c43e1729675
commit 63bd856fdd86802f7c17348a3ea24c43e1729675 Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 14 21:14:52 2018 -0500 elm_entry: rename some eo methods cursor_content -> textblock_cursor_content cursor_geometry -> textblock_cursor_geometry probably all cursor methods here should be renamed to something to increase consistency --- src/lib/elementary/elm_entry.c | 4 ++-- src/lib/elementary/elm_entry.eo | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 1fbd43488a..4a047636d0 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -4368,7 +4368,7 @@ _elm_entry_select_region_get(Eo *obj, Elm_Entry_Data *sd, int *start, int *end) } EOLIAN static Eina_Bool -_elm_entry_cursor_geometry_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) +_elm_entry_textblock_cursor_geometry_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { edje_object_part_text_cursor_geometry_get (sd->entry_edje, "elm.text", x, y, w, h); @@ -4458,7 +4458,7 @@ _elm_entry_cursor_is_visible_format_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd) } EOLIAN static char* -_elm_entry_cursor_content_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd) +_elm_entry_textblock_cursor_content_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd) { return edje_object_part_text_cursor_content_get (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index a72d3443c3..0d00311c94 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo @@ -470,7 +470,7 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, return: Efl.Canvas.Object; [[Textblock object]] } } - @property cursor_geometry { + @property textblock_cursor_geometry { get { [[This function returns the geometry of the cursor. @@ -478,6 +478,7 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, or for example in the case of scrolled entry where you want to show the cursor. ]] + legacy: elm_entry_cursor_geometry_get; return: bool; [[$true on success, $false otherwise]] } values { @@ -512,7 +513,7 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, return: bool; [[$true if format node exists, $false otherwise]] } } - @property cursor_content { + @property textblock_cursor_content { get { [[Get the character pointed by the cursor at its current position. @@ -521,6 +522,7 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Only the text is returned, any format that may exist will not be part of the return value. You must free the string when done with \@ref free. ]] + legacy: elm_entry_cursor_content_get; return: mstring @owned @warn_unused; [[Character]] } } --
