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

[naviframe] Fix to enable item deletion in pop_cb 

Summary: Fix to enable item deletion in the registered pop_cb function

Reviewers: Hermet

Reviewed By: Hermet

CC: seoz

Differential Revision: https://phab.enlightenment.org/D487
This commit is contained in:
Jaehyun Cho 2014-01-22 22:13:51 +09:00 committed by ChunEon Park
parent 1ca6d33e08
commit 404093c701
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
legacy/elementary/src/lib/elc_naviframe.c
View File

@ -504,6 +504,9 @@ _item_del_pre_hook(Elm_Object_Item *it)
nit = (Elm_Naviframe_Item *)it;
ELM_NAVIFRAME_DATA_GET(WIDGET(nit), sd);
nit->delete_me = EINA_TRUE;
if (nit->ref > 0) return EINA_FALSE;
ecore_animator_del(nit->animator);
top = (it == elm_naviframe_top_item_get(WIDGET(nit)));
@ -1696,14 +1699,26 @@ _item_pop(Eo *obj, void *_pd, va_list *list)
if (it->popping) return;
it->popping = EINA_TRUE;
evas_object_ref(obj);
if (it->pop_cb)
{
it->ref++;
if (!it->pop_cb(it->pop_data, (Elm_Object_Item *)it))
{
it->ref--;
if (it->delete_me)
{
_item_del_pre_hook(it);
_elm_widget_item_free(it);
}
it->popping = EINA_FALSE;
evas_object_unref(obj);
return;
}
it->ref--;
}
evas_object_unref(obj);
if (sd->preserve)
content = it->content;

2
legacy/elementary/src/lib/elm_widget_naviframe.h
View File

@ -57,6 +57,8 @@ struct _Elm_Naviframe_Item
Eina_Bool title_enabled : 1;
Eina_Bool unfocusable : 1;
Eina_Bool popping : 1;
Eina_Bool delete_me : 1;
int ref;
};
typedef struct _Elm_Naviframe_Content_Item_Pair Elm_Naviframe_Content_Item_Pair;