jaehyun pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9f5e9ec7ca120242a92ac97fb20016263c152d8e
commit 9f5e9ec7ca120242a92ac97fb20016263c152d8e
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date: Wed Dec 14 19:53:49 2016 +0900
naviframe: Raise previous view after item pop is finished.
Previously, previous view was raised immediately when item pop is
started so previous view covers current view when item pop is started.
Now, previous view is raised after item pop is finished so previous view
covers current view when item pop is finished.
Change-Id: I86f343e0b49f3801d00e553755896f0eb756daa0
---
src/lib/elementary/elc_naviframe.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/lib/elementary/elc_naviframe.c
b/src/lib/elementary/elc_naviframe.c
index de789a0..c8bce97 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -1132,9 +1132,17 @@ _on_item_pop_finished(void *data,
const char *source EINA_UNUSED)
{
Elm_Naviframe_Item_Data *it = data;
+ Elm_Naviframe_Item_Data *prev_it = NULL;
ELM_NAVIFRAME_DATA_GET(WIDGET(it), sd);
+ if (sd->stack && sd->stack->last)
+ {
+ prev_it = EINA_INLIST_CONTAINER_GET
+ (sd->stack->last, Elm_Naviframe_Item_Data);
+ _resize_object_reset(WIDGET(it), prev_it);
+ }
+
if (sd->preserve)
elm_widget_tree_unfocusable_set(VIEW(it), EINA_FALSE);
sd->popping = eina_list_remove(sd->popping, it);
@@ -1805,8 +1813,6 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd)
evas_object_freeze_events_set(VIEW(prev_it), EINA_TRUE);
}
- _resize_object_reset(obj, prev_it);
-
/* these 2 signals MUST take place simultaneously */
elm_object_signal_emit(VIEW(it), "elm,state,cur,popped", "elm");
elm_object_signal_emit(VIEW(prev_it), "elm,state,prev,popped", "elm");
--
