From 02db89028177ac62ed53ed8aa82bad1e8a3258ac Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Wed, 6 Sep 2017 20:04:41 +0900 Subject: [PATCH] naviframe: Fix to finish transition for newly pushed item Suppose naviframe top item is "A" and a new item "B" is newly pushed. In this case, if "A" is deleted by elm_object_item_del() before transition for "B" is started, then signal for "B" is also not sent and "B" does not become visible. The above issue happened if the transition effect was implemented by using deferred signals (i.e. "pushed,deferred" and "popped,deferred"). To resolve the above issue, the signal only for the deleted item is not sent. Suppose naviframe top item is "A" and a new item "B" is newly pushed. In this case, if "B" is deleted by elm_object_item_del() before transition for "B" is started, then signal for "A" is still sent and "A" becomes invisible. To resolve the above issue, if the deleted item is the top item and it is in the middle of item push, then all the signals related to the deleted item are not sent. Change-Id: I33c9f5039a8d3a3e5c60259a14edae395503ddd8 --- src/lib/elc_naviframe.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index ffba4aec8..38fc156f0 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -703,16 +703,23 @@ end: // make sure there is no more reference to this item. EINA_LIST_FOREACH(sd->ops, l, nfo) { - /* If an transition is cancelled by deleting an item, then the pair - * transition also should be cancelled. - * This case can happen when an item is deleted by elm_object_item_del() - * right after the item is newly pushed. - */ - if ((nfo->self == nit) || (nfo->related == nit)) + /* If an item is newly pushed and then deleted by elm_object_item_del() + * before item push transition is not started, then the item push + * transitions for both new item and current item should be cancelled. + * Otherwise, the current item becomes invisible due to the item push + * transition. */ + if ((nit->pushing) && (nfo->self == nit)) { nfo->self = NULL; nfo->related = NULL; } + else + { + if (nfo->self == nit) + nfo->self = NULL; + if (nfo->related == nit) + nfo->related = NULL; + } } _item_free(nit); -- 2.34.1