hermet pushed a commit to branch master.
commit 3c8cca95e4b2fb93525f05da4055c38a8234a2ce
Author: ChunEon Park <[email protected]>
Date: Sun Jun 30 17:42:59 2013 +0900
elementary/naviframe - If the current item is added as the resize object,
the previous will be canceled.
Now, keep the smart members always.
---
src/lib/elc_naviframe.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index d49dbae..96224cb 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -42,6 +42,12 @@ _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)
{
@@ -50,12 +56,6 @@ _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
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
