zmike pushed a commit to branch efl-1.22. http://git.enlightenment.org/core/efl.git/commit/?id=50134d81ece9200e96f594973e7ec38f6a81cf5e
commit 50134d81ece9200e96f594973e7ec38f6a81cf5e Author: Mike Blumenkrantz <[email protected]> Date: Wed May 29 09:17:18 2019 -0400 elm/entry: use edje functions directly for interacting with edje objects Summary: this eliminates a number of errors triggered when processing class hierarchy to reach the desired subobject with these edje functions @fix Depends on D8958 Reviewers: bu5hm4n Reviewed By: bu5hm4n Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8959 --- src/lib/elementary/elm_entry.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index f749522143..03a54d8c53 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -1385,19 +1385,19 @@ _show_region_hook(void *data EINA_UNUSED, Evas_Object *obj, Eina_Rect r) } EOLIAN static Eina_Bool -_elm_entry_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Evas_Object *sobj) +_elm_entry_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Entry_Data *sd, Evas_Object *sobj) { Eina_Bool ret = EINA_FALSE; /* unfortunately entry doesn't follow the signal pattern * elm,state,icon,{visible,hidden}, so we have to replicate this * smart function */ - if (sobj == elm_layout_content_get(obj, "elm.swallow.icon")) + if (sobj == edje_object_part_swallow_get(sd->scr_edje, "elm.swallow.icon")) { - elm_layout_signal_emit(obj, "elm,action,hide,icon", "elm"); + edje_object_signal_emit(sd->scr_edje, "elm,action,hide,icon", "elm"); } - else if (sobj == elm_layout_content_get(obj, "elm.swallow.end")) + else if (sobj == edje_object_part_swallow_get(sd->scr_edje, "elm.swallow.end")) { - elm_layout_signal_emit(obj, "elm,action,hide,end", "elm"); + edje_object_signal_emit(sd->scr_edje, "elm,action,hide,end", "elm"); } ret = elm_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj); @@ -5217,27 +5217,27 @@ _elm_entry_scrollable_get(const Eo *obj EINA_UNUSED, Elm_Entry_Data *sd) } EOLIAN static void -_elm_entry_icon_visible_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool setting) +_elm_entry_icon_visible_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool setting) { - if (!elm_layout_content_get(obj, "elm.swallow.icon")) return; + if (!edje_object_part_swallow_get(sd->scr_edje, "elm.swallow.icon")) return; if (setting) - elm_layout_signal_emit(obj, "elm,action,show,icon", "elm"); + edje_object_signal_emit(sd->scr_edje, "elm,action,show,icon", "elm"); else - elm_layout_signal_emit(obj, "elm,action,hide,icon", "elm"); + edje_object_signal_emit(sd->scr_edje, "elm,action,hide,icon", "elm"); elm_layout_sizing_eval(obj); } EOLIAN static void -_elm_entry_end_visible_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool setting) +_elm_entry_end_visible_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool setting) { - if (!elm_layout_content_get(obj, "elm.swallow.end")) return; + if (!edje_object_part_swallow_get(sd->scr_edje, "elm.swallow.end")) return; if (setting) - elm_layout_signal_emit(obj, "elm,action,show,end", "elm"); + edje_object_signal_emit(sd->scr_edje, "elm,action,show,end", "elm"); else - elm_layout_signal_emit(obj, "elm,action,hide,end", "elm"); + edje_object_signal_emit(sd->scr_edje, "elm,action,hide,end", "elm"); elm_layout_sizing_eval(obj); } --
