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

elementary/naviframe - don't try to pop the naviframe item multiple times.

This commit is contained in:
ChunEon Park 2013-04-17 22:08:41 +09:00
parent 6883e2a2b1
commit d7d77edf42
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/elementary/ChangeLog
View File

@ -1260,3 +1260,7 @@
2013-04-16 WooHyun Jung
* When entry is disabled, scrolling is also disabled.
2013-04-17 ChunEon Park
* Don't try to pop the naviframe item multiple times.

1
legacy/elementary/NEWS
View File

@ -98,6 +98,7 @@ Improvements:
* Naviframe is now supproting focus_direction.
* Scroller decides whether the accelerator is on or not, depending on the velocity and the interval time of the flick event.
* Ctxpopup is now supproting focus_direction.
* Don't try to pop the naviframe item multiple times.
Fixes:

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

@ -1617,9 +1617,17 @@ _item_pop(Eo *obj, void *_pd, va_list *list)
it = (Elm_Naviframe_Item *)elm_naviframe_top_item_get(obj);
if (!it) return;
if (it->animator || it->popping) return;
it->popping = EINA_TRUE;
if (it->pop_cb)
{
if (!it->pop_cb(it->pop_data, (Elm_Object_Item *)it)) return;
if (!it->pop_cb(it->pop_data, (Elm_Object_Item *)it))
{
it->popping = EINA_FALSE;
return;
}
}
if (sd->preserve)

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

@ -56,6 +56,7 @@ struct _Elm_Naviframe_Item
Eina_Bool title_visible : 1;
Eina_Bool unfocusable : 1;
Eina_Bool popping : 1;
};
typedef struct _Elm_Naviframe_Content_Item_Pair Elm_Naviframe_Content_Item_Pair;