forked from enlightenment/efl
elm test_index.c: 1. do not need to call elm_list_selected_item_get(). event_info is a selected item. 2. check index item before using it.
SVN revision: 79282
This commit is contained in:
parent
264bbe0d8f
commit
56fce12f77
|
@ -289,16 +289,13 @@ test_index2_it_add(void *data, Evas_Object *obj __UNUSED__, void *event_info __U
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
test_index2_it_del(void *data, Evas_Object *obj, void *event_info __UNUSED__)
|
test_index2_it_del(void *data, Evas_Object *obj __UNUSED__, void *event_info)
|
||||||
{
|
{
|
||||||
Test_Index2_Elements *gui = data;
|
Test_Index2_Elements *gui = data;
|
||||||
const char *label, *label_next;
|
const char *label, *label_next;
|
||||||
Elm_Object_Item *list_it, *list_it_next;
|
Elm_Object_Item *list_it = event_info, *list_it_next, *iit;
|
||||||
Elm_Object_Item *iit;
|
|
||||||
|
|
||||||
list_it = elm_list_selected_item_get(obj);
|
|
||||||
list_it_next = elm_list_item_next(list_it);
|
list_it_next = elm_list_item_next(list_it);
|
||||||
|
|
||||||
if (!list_it_next)
|
if (!list_it_next)
|
||||||
{
|
{
|
||||||
iit = elm_index_item_find(gui->id, list_it);
|
iit = elm_index_item_find(gui->id, list_it);
|
||||||
|
@ -311,10 +308,13 @@ test_index2_it_del(void *data, Evas_Object *obj, void *event_info __UNUSED__)
|
||||||
label_next = elm_object_item_text_get(list_it_next);
|
label_next = elm_object_item_text_get(list_it_next);
|
||||||
|
|
||||||
iit = elm_index_item_find(gui->id, list_it);
|
iit = elm_index_item_find(gui->id, list_it);
|
||||||
if (label[0] == label_next[0])
|
if (iit)
|
||||||
elm_object_item_data_set(iit, list_it_next);
|
{
|
||||||
else
|
if (label[0] == label_next[0])
|
||||||
elm_object_item_del(iit);
|
elm_object_item_data_set(iit, list_it_next);
|
||||||
|
else
|
||||||
|
elm_object_item_del(iit);
|
||||||
|
}
|
||||||
|
|
||||||
elm_object_item_del(list_it);
|
elm_object_item_del(list_it);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue