hermet pushed a commit to branch master.
commit a6e5a4bfd3131f795963a53c53b6b1067497cc15
Author: ChunEon Park <[email protected]>
Date: Mon Jul 29 19:51:44 2013 +0900
elementary/naviframe - eeek. please keep the smart member order.
---
src/lib/elc_naviframe.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 900e909..21acdc4 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -42,20 +42,21 @@ _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)
{
+ elm_widget_resize_object_set(obj, NULL);
elm_widget_sub_object_add(obj, VIEW(prev_it));
evas_object_smart_member_add(VIEW(prev_it), obj);
}
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
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
