forked from enlightenment/efl
elementary/naviframe - don't try to pop the naviframe item multiple times.
This commit is contained in:
parent
6883e2a2b1
commit
d7d77edf42
|
@ -1260,3 +1260,7 @@
|
||||||
2013-04-16 WooHyun Jung
|
2013-04-16 WooHyun Jung
|
||||||
|
|
||||||
* When entry is disabled, scrolling is also disabled.
|
* When entry is disabled, scrolling is also disabled.
|
||||||
|
|
||||||
|
2013-04-17 ChunEon Park
|
||||||
|
|
||||||
|
* Don't try to pop the naviframe item multiple times.
|
||||||
|
|
|
@ -98,6 +98,7 @@ Improvements:
|
||||||
* Naviframe is now supproting focus_direction.
|
* 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.
|
* 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.
|
* Ctxpopup is now supproting focus_direction.
|
||||||
|
* Don't try to pop the naviframe item multiple times.
|
||||||
|
|
||||||
Fixes:
|
Fixes:
|
||||||
|
|
||||||
|
|
|
@ -1617,9 +1617,17 @@ _item_pop(Eo *obj, void *_pd, va_list *list)
|
||||||
it = (Elm_Naviframe_Item *)elm_naviframe_top_item_get(obj);
|
it = (Elm_Naviframe_Item *)elm_naviframe_top_item_get(obj);
|
||||||
if (!it) return;
|
if (!it) return;
|
||||||
|
|
||||||
|
if (it->animator || it->popping) return;
|
||||||
|
|
||||||
|
it->popping = EINA_TRUE;
|
||||||
|
|
||||||
if (it->pop_cb)
|
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)
|
if (sd->preserve)
|
||||||
|
|
|
@ -56,6 +56,7 @@ struct _Elm_Naviframe_Item
|
||||||
|
|
||||||
Eina_Bool title_visible : 1;
|
Eina_Bool title_visible : 1;
|
||||||
Eina_Bool unfocusable : 1;
|
Eina_Bool unfocusable : 1;
|
||||||
|
Eina_Bool popping : 1;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct _Elm_Naviframe_Content_Item_Pair Elm_Naviframe_Content_Item_Pair;
|
typedef struct _Elm_Naviframe_Content_Item_Pair Elm_Naviframe_Content_Item_Pair;
|
||||||
|
|
Loading…
Reference in New Issue