From 84674d04dc18d677d5a1c5c47ec51dfa32999bbb Mon Sep 17 00:00:00 2001 From: SangHyeon Jade Lee Date: Thu, 14 Nov 2019 19:51:25 +0900 Subject: [PATCH] Revert "elm/genlist: defer recalc when applying a name filter" This reverts commit 706e4b279f2da6bdeee28d4ee390b08a58ba0161. Change-Id: I1e5019e7764cbb0cbc25e82baed89761070d80fd --- src/lib/elementary/elm_genlist.c | 10 +++------- src/lib/elementary/elm_widget_genlist.h | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index fef5301..c9663bb 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -849,7 +849,6 @@ _calc_job(void *data) Evas_Coord minw = -1, minh = 0, y = 0, ow = 0, vw = 0; Evas *e; - sd->need_calc = EINA_FALSE; evas_object_geometry_get(sd->pan_obj, NULL, NULL, &ow, &sd->h); if (sd->mode == ELM_LIST_COMPRESS) elm_interface_scrollable_content_viewport_geometry_get @@ -1011,14 +1010,12 @@ _elm_genlist_efl_canvas_group_group_calculate(Eo *obj, Elm_Genlist_Data *sd) { itb->must_recalc = EINA_TRUE; } - sd->need_calc = EINA_TRUE; + _calc_job(sd); } minw = vmw; minh = vmh; } else - sd->need_calc = EINA_TRUE; - if (sd->need_calc) _calc_job(sd); if (sd->scr_minw) @@ -8343,7 +8340,6 @@ _item_filtered_get(Elm_Gen_Item *it, Elm_Genlist_Data *sd) if (it->item->block) it->item->block->changed = EINA_TRUE; efl_canvas_group_change(sd->obj); - sd->need_calc = EINA_TRUE; } return !it->hide; } @@ -8442,8 +8438,6 @@ _elm_genlist_filter_set(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd, void *filter_ sd->filter_queue = eina_list_append(sd->filter_queue, it); } itb->changed = EINA_TRUE; - evas_object_smart_changed(obj); - sd->need_calc = EINA_TRUE; } else { @@ -8455,6 +8449,8 @@ _elm_genlist_filter_set(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd, void *filter_ } } } + _calc_job(sd); + if (!sd->filter_queue) efl_event_callback_legacy_call(sd->obj, ELM_GENLIST_EVENT_FILTER_DONE, NULL); else diff --git a/src/lib/elementary/elm_widget_genlist.h b/src/lib/elementary/elm_widget_genlist.h index 6ce705e..c7e520d 100644 --- a/src/lib/elementary/elm_widget_genlist.h +++ b/src/lib/elementary/elm_widget_genlist.h @@ -206,7 +206,6 @@ struct _Elm_Genlist_Data Eina_Bool tree_effect_animator : 1; Eina_Bool pin_item_top : 1; - Eina_Bool need_calc : 1; /* _calc_job() must be called in group_calc */ //Tizen Only Eina_List *prepend_items; @@ -219,6 +218,7 @@ struct _Elm_Genlist_Data //TIZEN_ONLY(20161104) : Accessibility : synchronized highlight of atspi and item align feature for wearable profile Elm_Gen_Item *currently_highlighted_item; // + }; typedef struct _Item_Block Item_Block; -- 2.7.4