From: Jee-Yong Um Date: Mon, 18 Apr 2016 23:33:41 +0000 (-0700) Subject: elementary: remove redundant reswallow logic in elm_layout X-Git-Tag: upstream/1.20.0~6750 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f17d0d090b98cb1b60526da4eadf754d54c052c;p=platform%2Fupstream%2Fefl.git elementary: remove redundant reswallow logic in elm_layout Summary: When theme is changed by elm_layout_theme/file_set, _edje_object_file_set_internal will be called internally and it updates swallowed objects. Elm.Layout doesn't need to reswallow its child objects. (with current code, searching cost for real part occurs.) Reviewers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D3898 Signed-off-by: Cedric BAIL --- diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c index 6569d79..2995a32 100644 --- a/src/lib/elementary/elm_layout.c +++ b/src/lib/elementary/elm_layout.c @@ -224,23 +224,6 @@ _parts_signals_emit(Elm_Layout_Smart_Data *sd) } static void -_parts_swallow_fix(Elm_Layout_Smart_Data *sd, Elm_Widget_Smart_Data *wd) -{ - Eina_List *l; - Elm_Layout_Sub_Object_Data *sub_d; - - EINA_LIST_FOREACH(sd->subs, l, sub_d) - { - if (sub_d->type == SWALLOW) - { - if (sub_d->part) - edje_object_part_swallow(wd->resize_obj, - sub_d->part, sub_d->obj); - } - } -} - -static void _parts_text_fix(Elm_Layout_Smart_Data *sd) { const Eina_List *l; @@ -333,7 +316,6 @@ _visuals_refresh(Evas_Object *obj, ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - _parts_swallow_fix(sd, wd); _parts_text_fix(sd); _parts_signals_emit(sd); _parts_cursors_apply(sd);