diff options
author | Jaeun Choi <jaeun12.choi@samsung.com> | 2017-03-30 20:13:39 +0900 |
---|---|---|
committer | Jaeun Choi <jaeun12.choi@samsung.com> | 2017-03-31 13:30:53 +0900 |
commit | a4d2c51d1404c1d8563dd7ac37e64ee105aa6226 (patch) | |
tree | 4e8cbab92ae14956f53f3bbfe3a3f590757c0cf2 | |
parent | 36ab489a6fbb546b26bdcbc5117bb8bf6adddc0c (diff) | |
download | efl-a4d2c51d1404c1d8563dd7ac37e64ee105aa6226.tar.gz |
elm_flipselector: fixed flipselector item deletion process
flipselector item destructor had a severe drawback and this patch fixes it.
when deleting multiple items at once, the view needs to be updated only once.
however, the destructor updated the view on deletion of
every single item and it caused a severe performance issue.
the worst case happened when deleting a flipselector object -
with 10000 items, it took 10 seconds to finish deletion.
this patch has two points:
1. if a flipselector object is on deletion, item destructor doesn't update the view
2. otherwise, view update is handled in one job for multiple item deletion
-rw-r--r-- | src/lib/elementary/elm_flipselector.c | 73 | ||||
-rw-r--r-- | src/lib/elementary/elm_widget_flipselector.h | 2 |
2 files changed, 47 insertions, 28 deletions
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index bae941edf0..dc14ecda88 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -253,47 +253,64 @@ _send_msg(Elm_Flipselector_Data *sd, _on_item_changed(sd); } +static void +_view_update(void *data) +{ + Evas_Object *obj = data; + ELM_FLIPSELECTOR_DATA_GET(obj, sd); + Elm_Object_Item *eo_item; + + sd->view_update = NULL; + sd->need_update = EINA_FALSE; + + if (sd->current) + { + eo_item = sd->current->data; + ELM_FLIPSELECTOR_ITEM_DATA_GET(eo_item, item); + _send_msg(sd, MSG_FLIP_DOWN, (char *)item->label); + } + else + { + _send_msg(sd, MSG_FLIP_DOWN, ""); + elm_layout_signal_emit(obj, "elm,state,button,hidden", "elm"); + } +} + EOLIAN static void _elm_flipselector_item_efl_object_destructor(Eo *eo_item, Elm_Flipselector_Item_Data *item) { - Elm_Object_Item *eo_item2; Eina_List *l; - ELM_FLIPSELECTOR_DATA_GET(WIDGET(item), sd); - EINA_LIST_FOREACH(sd->items, l, eo_item2) + if (sd->deleting) { - if (eo_item2 == eo_item) - { - if (sd->current == l) - { - sd->current = l->prev; - if (!sd->current) sd->current = l->next; - if (sd->current) - { - eo_item2 = sd->current->data; - ELM_FLIPSELECTOR_ITEM_DATA_GET(eo_item2, item2); - _send_msg(sd, MSG_FLIP_DOWN, (char *)item2->label); - } - else _send_msg(sd, MSG_FLIP_DOWN, ""); - } - sd->items = eina_list_remove_list(sd->items, l); - break; - } + eina_stringshare_del(item->label); + sd->items = eina_list_remove(sd->items, eo_item); + efl_destructor(efl_super(eo_item, ELM_FLIPSELECTOR_ITEM_CLASS)); + + return; } - if (eina_list_count(sd->items) <= 1) - elm_layout_signal_emit - (sd->obj, "elm,state,button,hidden", "elm"); - else - elm_layout_signal_emit - (sd->obj, "elm,state,button,visible", "elm"); + if ((sd->current) && (sd->current->data == eo_item)) + { + sd->need_update = EINA_TRUE; + l = sd->current->prev; + if (!l) l = sd->current->next; + if (!l) sd->current = NULL; + else sd->current = l; + } eina_stringshare_del(item->label); + sd->items = eina_list_remove(sd->items, eo_item); + efl_destructor(efl_super(eo_item, ELM_FLIPSELECTOR_ITEM_CLASS)); + _sentinel_eval(sd); - _update_view(sd->obj); - efl_destructor(efl_super(eo_item, ELM_FLIPSELECTOR_ITEM_CLASS)); + if (sd->need_update) + { + if (sd->view_update) ecore_job_del(sd->view_update); + sd->view_update = ecore_job_add(_view_update, WIDGET(item)); + } } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_widget_flipselector.h b/src/lib/elementary/elm_widget_flipselector.h index 2e348abbc2..1fca1a623d 100644 --- a/src/lib/elementary/elm_widget_flipselector.h +++ b/src/lib/elementary/elm_widget_flipselector.h @@ -32,6 +32,7 @@ struct _Elm_Flipselector_Data Eina_List *sentinel; /* item containing the largest * label string */ Ecore_Timer *spin; + Ecore_Job *view_update; unsigned int max_len; double interval, first_interval; @@ -41,6 +42,7 @@ struct _Elm_Flipselector_Data int walking; Eina_Bool evaluating : 1; Eina_Bool deleting : 1; + Eina_Bool need_update : 1; }; typedef struct _Elm_Flipselector_Item_Data Elm_Flipselector_Item_Data; |