hermet pushed a commit to branch master.
commit c245cbe27b45d2c7b22ef42ad9161629dd94d5dc
Author: ChunEon Park <[email protected]>
Date: Thu Jun 13 15:46:16 2013 +0900
elemenatry/naviframe - keep the current view on top to have events and
don't try to add member for the deleted dummy.
---
src/lib/elc_naviframe.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 7dfc145..d9704b3 100644
--- a/src/lib/elc_naviframe.c
+++ b/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);
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
