summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2016-11-29 20:49:04 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2016-11-29 20:59:50 +0900
commit29a7d08454bfee6c0c29b424b99ca20994a6ca28 (patch)
treeb5795c9253ff8fcf48eec76b269772aca84166b1
parent1f9dfe2ed374bd54dd84aaf70abb496b021269cb (diff)
downloadefl-29a7d08454bfee6c0c29b424b99ca20994a6ca28.tar.gz
naviframe: Fix to show hidden previous view when pop transition begins.
Previously, previous view became visible before pop transition begins by "elm,state,prev,popped,deferred" signal. Now, previous view become visible when pop transition begins by "elm,state,prev,popped,deferred" signal.
-rw-r--r--src/lib/elementary/elc_naviframe.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index b455a75f3a..5a962844ab 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -1448,6 +1448,10 @@ _deferred(void *data, const Efl_Event *event EINA_UNUSED)
_send_signal(cur, signals_cur[nfo->push]);
_send_signal(other, nfo->push ? signals_new : signals_prev);
+ //Show hidden previous view when pop transition begins.
+ if (!nfo->push)
+ evas_object_show(VIEW(other));
+
free(nfo);
}
@@ -1807,9 +1811,7 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd)
/* these 2 signals MUST take place simultaneously */
elm_object_signal_emit(VIEW(it), "elm,state,cur,popped", "elm");
- evas_object_show(VIEW(prev_it));
elm_object_signal_emit(VIEW(prev_it), "elm,state,prev,popped", "elm");
-
edje_object_message_signal_process(elm_layout_edje_get(VIEW(it)));
edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it)));