kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jaeun Choi 2017-03-30 20:13:39 +09:00
parent 36ab489a6f
commit a4d2c51d14
2 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/lib/elementary/elm_flipselector.c
View File

@ -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);
_sentinel_eval(sd);
_update_view(sd->obj);
sd->items = eina_list_remove(sd->items, eo_item);
efl_destructor(efl_super(eo_item, ELM_FLIPSELECTOR_ITEM_CLASS));
_sentinel_eval(sd);
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 *

2
src/lib/elementary/elm_widget_flipselector.h
View File

@ -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;