discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f0b4de1b4d6977de11a6c0ee16ca8474d8092b7f
commit f0b4de1b4d6977de11a6c0ee16ca8474d8092b7f Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 14 21:14:52 2018 -0500 elm_entry: remove 'calc_force' use Efl.Layout.Calc which is already inherited --- src/lib/elementary/elm_entry.c | 9 ++++++++- src/lib/elementary/elm_entry.eo | 8 +------- src/lib/elementary/elm_entry_legacy.h | 12 ++++++++++++ 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 4a047636d0..155aa8df28 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -2,6 +2,7 @@ # include "elementary_config.h" #endif +#define EFL_LAYOUT_CALC_PROTECTED #define EFL_ACCESS_PROTECTED #define EFL_ACCESS_TEXT_PROTECTED #define EFL_ACCESS_EDITABLE_TEXT_PROTECTED @@ -4153,6 +4154,12 @@ _elm_entry_password_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd) } EAPI void +elm_entry_calc_force(Evas_Object *obj) +{ + efl_layout_calc_force(obj); +} + +EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry) { @@ -4200,7 +4207,7 @@ _elm_entry_textblock_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd) } EOLIAN static void -_elm_entry_calc_force(Eo *obj, Elm_Entry_Data *sd) +_elm_entry_efl_layout_calc_calc_force(Eo *obj, Elm_Entry_Data *sd) { edje_object_calc_force(sd->entry_edje); sd->changed = EINA_TRUE; diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index 0d00311c94..5a1e679bef 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo @@ -593,13 +593,6 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, This will typically cause the Input Method Context to clear the preedit state. ]] } - calc_force { - [[Forces calculation of the entry size and text layouting. - - This should be used after modifying the textblock object directly. See - @.textblock.get for more information. - ]] - } anchor_hover_end { [[Ends the hover popup in the entry @@ -848,6 +841,7 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Efl.Layout.Signal.signal_callback_add; Efl.Layout.Signal.signal_callback_del; Efl.Layout.Signal.signal_emit; + Efl.Layout.Calc.calc_force; Efl.Ui.Widget.on_access_activate; Efl.Ui.Widget.theme_apply; Efl.Ui.Focus.Object.on_focus_update; diff --git a/src/lib/elementary/elm_entry_legacy.h b/src/lib/elementary/elm_entry_legacy.h index ef10268c3f..7e54218d07 100644 --- a/src/lib/elementary/elm_entry_legacy.h +++ b/src/lib/elementary/elm_entry_legacy.h @@ -73,3 +73,15 @@ EAPI Eina_Bool elm_entry_file_set(Evas_Object *obj, const char *file, E * @param[out] format The file format */ EAPI void elm_entry_file_get(const Evas_Object *obj, const char **file, Elm_Text_Format *format); + + +/** + * @brief Forces calculation of the entry size and text layouting. + * + * This should be used after modifying the textblock object directly. See + * @ref elm_entry_textblock_get for more information. + * @param[in] obj The object. + * + * @ingroup Elm_Entry + */ +EAPI void elm_entry_calc_force(Evas_Object *obj); --
