summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-05-29 09:17:18 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-05-29 12:29:03 -0400
commita9ef4ab348ccbd545256e1d5fb5f219b298e16de (patch)
tree6aeabcf82be0914c1e67459d5bc1ec0d1f5c57f6
parent396f150fb48c17394c52f9849659b764f9fa7f01 (diff)
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
-rw-r--r--src/lib/elementary/elm_entry.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 37e75245dc..ad627a0dc7 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)
1385} 1385}
1386 1386
1387EOLIAN static Eina_Bool 1387EOLIAN static Eina_Bool
1388_elm_entry_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Evas_Object *sobj) 1388_elm_entry_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Entry_Data *sd, Evas_Object *sobj)
1389{ 1389{
1390 Eina_Bool ret = EINA_FALSE; 1390 Eina_Bool ret = EINA_FALSE;
1391 /* unfortunately entry doesn't follow the signal pattern 1391 /* unfortunately entry doesn't follow the signal pattern
1392 * elm,state,icon,{visible,hidden}, so we have to replicate this 1392 * elm,state,icon,{visible,hidden}, so we have to replicate this
1393 * smart function */ 1393 * smart function */
1394 if (sobj == elm_layout_content_get(obj, "elm.swallow.icon")) 1394 if (sobj == edje_object_part_swallow_get(sd->scr_edje, "elm.swallow.icon"))
1395 { 1395 {
1396 elm_layout_signal_emit(obj, "elm,action,hide,icon", "elm"); 1396 edje_object_signal_emit(sd->scr_edje, "elm,action,hide,icon", "elm");
1397 } 1397 }
1398 else if (sobj == elm_layout_content_get(obj, "elm.swallow.end")) 1398 else if (sobj == edje_object_part_swallow_get(sd->scr_edje, "elm.swallow.end"))
1399 { 1399 {
1400 elm_layout_signal_emit(obj, "elm,action,hide,end", "elm"); 1400 edje_object_signal_emit(sd->scr_edje, "elm,action,hide,end", "elm");
1401 } 1401 }
1402 1402
1403 ret = elm_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj); 1403 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)
5217} 5217}
5218 5218
5219EOLIAN static void 5219EOLIAN static void
5220_elm_entry_icon_visible_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool setting) 5220_elm_entry_icon_visible_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool setting)
5221{ 5221{
5222 if (!elm_layout_content_get(obj, "elm.swallow.icon")) return; 5222 if (!edje_object_part_swallow_get(sd->scr_edje, "elm.swallow.icon")) return;
5223 5223
5224 if (setting) 5224 if (setting)
5225 elm_layout_signal_emit(obj, "elm,action,show,icon", "elm"); 5225 edje_object_signal_emit(sd->scr_edje, "elm,action,show,icon", "elm");
5226 else 5226 else
5227 elm_layout_signal_emit(obj, "elm,action,hide,icon", "elm"); 5227 edje_object_signal_emit(sd->scr_edje, "elm,action,hide,icon", "elm");
5228 5228
5229 elm_layout_sizing_eval(obj); 5229 elm_layout_sizing_eval(obj);
5230} 5230}
5231 5231
5232EOLIAN static void 5232EOLIAN static void
5233_elm_entry_end_visible_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool setting) 5233_elm_entry_end_visible_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool setting)
5234{ 5234{
5235 if (!elm_layout_content_get(obj, "elm.swallow.end")) return; 5235 if (!edje_object_part_swallow_get(sd->scr_edje, "elm.swallow.end")) return;
5236 5236
5237 if (setting) 5237 if (setting)
5238 elm_layout_signal_emit(obj, "elm,action,show,end", "elm"); 5238 edje_object_signal_emit(sd->scr_edje, "elm,action,show,end", "elm");
5239 else 5239 else
5240 elm_layout_signal_emit(obj, "elm,action,hide,end", "elm"); 5240 edje_object_signal_emit(sd->scr_edje, "elm,action,hide,end", "elm");
5241 5241
5242 elm_layout_sizing_eval(obj); 5242 elm_layout_sizing_eval(obj);
5243} 5243}