projects
/
framework
/
uifw
/
elementary.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e603c5a
)
Revert "elementary/naviframe - If the current item is added as the resize object...
author
Sungho Kwak
<sungho1.kwak@samsung.com>
Tue, 2 Jul 2013 23:15:54 +0000
(08:15 +0900)
committer
Sungho Kwak
<sungho1.kwak@samsung.com>
Thu, 4 Jul 2013 07:38:04 +0000
(16:38 +0900)
This reverts commit
4c9356300d0eea93120a1f12b93e61e131a2c817
.
Change-Id: I231e3a2ee95c35f5be0284172624bd3376dce9ea
src/lib/elc_naviframe.c
patch
|
blob
|
history
diff --git
a/src/lib/elc_naviframe.c
b/src/lib/elc_naviframe.c
index
5bb6246
..
93f4765
100644
(file)
--- a/
src/lib/elc_naviframe.c
+++ b/
src/lib/elc_naviframe.c
@@
-40,12
+40,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)
{
@@
-54,6
+48,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