forked from enlightenment/efl
elementary/naviframe - dont' be popped if the event is freezed and popping is going on.
This commit is contained in:
parent
64a8f6608e
commit
5488d7c1b4
|
@ -1425,3 +1425,7 @@
|
|||
|
||||
* Replace uri to url from elm_web_uri_get, elm_web_uri_set and "uri,changed" signal.
|
||||
Previous APIs and signal are deprecated.
|
||||
|
||||
2013-06-16 ChunEon Park (Hermet)
|
||||
|
||||
* Naviframe: Dont' be popped if the event is freezed and popping is going on.
|
||||
|
|
|
@ -254,6 +254,7 @@ Removals:
|
|||
* Deprecate elm_label_slide_set(), elm_label_slide_get().
|
||||
* Deprecate elm_object_domain_translatable_text_part_set(), elm_object_translatable_text_part_get().
|
||||
* Deprecate elm_web_uri_set(), elm_web_uri_get() and "uri,changed" signal for web, web2.
|
||||
* Naviframe: Dont' be popped if the event is freezed and popping is going on.
|
||||
|
||||
Changes since Elementary 1.0.0:
|
||||
-------------------------
|
||||
|
|
|
@ -1376,9 +1376,8 @@ _elm_naviframe_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
}
|
||||
|
||||
static void
|
||||
_elm_naviframe_smart_event(Eo *obj, void *_pd, va_list *list)
|
||||
_elm_naviframe_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
|
||||
{
|
||||
Elm_Naviframe_Smart_Data *sd = _pd;
|
||||
Evas_Object *source = va_arg(*list, Evas_Object *);
|
||||
Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
|
||||
Evas_Event_Key_Down *ev = va_arg(*list, Evas_Event_Key_Down *);
|
||||
|
@ -1398,8 +1397,6 @@ _elm_naviframe_smart_event(Eo *obj, void *_pd, va_list *list)
|
|||
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
|
||||
if (ret) *ret = EINA_TRUE;
|
||||
|
||||
if (sd->freeze_events && sd->popping) return;
|
||||
|
||||
//FIXME: Replace this below code to elm_naviframe_item_pop() at elm 2.0.
|
||||
///Leave for compatibility.
|
||||
if (it->title_prev_btn)
|
||||
|
@ -1653,6 +1650,8 @@ _item_pop(Eo *obj, void *_pd, va_list *list)
|
|||
|
||||
Elm_Naviframe_Smart_Data *sd = _pd;
|
||||
|
||||
if (sd->freeze_events && sd->popping) return;
|
||||
|
||||
it = (Elm_Naviframe_Item *)elm_naviframe_top_item_get(obj);
|
||||
if (!it) return;
|
||||
|
||||
|
|
Loading…
Reference in New Issue