summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2012-11-22 14:51:27 +0000
committerChunEon Park <hermet@hermet.pe.kr>2012-11-22 14:51:27 +0000
commita9a593f7bb0297080c5fd7e7fdb993ae6833c9d8 (patch)
treeaf83b134a3a0e811bb56606d3a0f776353f710c8
parent625416efa506350e3d7e5e783f1fc8c4c400ae39 (diff)
elementary/naviframe - backport 79541
SVN revision: 79542
-rw-r--r--ChangeLog5
-rw-r--r--NEWS1
-rw-r--r--src/lib/elc_naviframe.c19
3 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 10da731fc..d7321f85f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -530,3 +530,8 @@
5302012-11-22 Michael Bouchaud (yoz) 5302012-11-22 Michael Bouchaud (yoz)
531 531
532 * fix elm_flip to show only one face at a time 532 * fix elm_flip to show only one face at a time
533
5342012-11-22 ChunEon Park (Hermet)
535
536 * Lets remove contents regardless of the preseve_on_set if naviframe is
537 deleted.
diff --git a/NEWS b/NEWS
index 4f820be9b..5f8b18a4f 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Fixes:
11 * Fix missing event selected in elm_index (elm_index_item_selected_set) 11 * Fix missing event selected in elm_index (elm_index_item_selected_set)
12 * Fix update the min size hint on elm_label after a text set 12 * Fix update the min size hint on elm_label after a text set
13 * Fix flip widget who show the two face at same time 13 * Fix flip widget who show the two face at same time
14 * Fix the naviframe to delete contents which are preserved_on set if the naviframe is deleted.
14 15
15 16
16Changes since Elementary 1.7.0: 17Changes since Elementary 1.7.0:
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 5b3ed2961..cd935af40 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -84,16 +84,19 @@ _item_free(Elm_Naviframe_Item *it)
84 evas_object_del(it->title_next_btn); 84 evas_object_del(it->title_next_btn);
85 if (it->title_icon) evas_object_del(it->title_icon); 85 if (it->title_icon) evas_object_del(it->title_icon);
86 86
87 if (sd->preserve && it->content) 87 if (it->content)
88 { 88 {
89 /* so that elm does not delete the contents with the item's 89 if ((sd->preserve) && (!sd->on_deletion))
90 * view after the del_pre_hook */ 90 {
91 edje_object_part_unswallow(VIEW(it), it->content); 91 /* so that elm does not delete the contents with the item's
92 evas_object_event_callback_del 92 * view after the del_pre_hook */
93 (it->content, EVAS_CALLBACK_DEL, _item_content_del_cb); 93 edje_object_part_unswallow(VIEW(it), it->content);
94 evas_object_event_callback_del
95 (it->content, EVAS_CALLBACK_DEL, _item_content_del_cb);
96 }
97 else
98 evas_object_del(it->content);
94 } 99 }
95 else if (it->content)
96 evas_object_del(it->content);
97} 100}
98 101
99static void 102static void