From 52632130624a893fe57c293c661727c0fe95a6b0 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 13 Jun 2013 15:46:16 +0900 Subject: [PATCH] elemenatry/naviframe - keep the current view on top to have events and don't try to add member for the deleted dummy. --- legacy/elementary/src/lib/elc_naviframe.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index 7dfc145b45..d9704b37d2 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -42,12 +42,6 @@ _resize_object_reset(Evas_Object *obj, Elm_Naviframe_Item *it, { ELM_NAVIFRAME_DATA_GET(obj, sd); - if (it) - { - elm_widget_resize_object_set(obj, VIEW(it)); - evas_object_raise(VIEW(it)); - } - //Recover previous smart members. if (prev_it) { @@ -56,6 +50,12 @@ _resize_object_reset(Evas_Object *obj, Elm_Naviframe_Item *it, } else if (dummy) evas_object_smart_member_add(sd->dummy_edje, obj); + + if (it) + { + elm_widget_resize_object_set(obj, VIEW(it)); + evas_object_raise(VIEW(it)); + } } static void @@ -520,7 +520,7 @@ _item_del_pre_hook(Elm_Object_Item *it) } end: - if (!sd->stack) + if (!sd->stack || (VIEW(it) != sd->dummy_edje)) _resize_object_reset(WIDGET(it), NULL, NULL, EINA_TRUE); _item_free(nit);