vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elementary/naviframe - let's remove contents which are preserved on set if the naviframe is deleted. 

SVN revision: 79541
This commit is contained in:
ChunEon Park 2012-11-22 14:47:08 +00:00
parent 5a4de3b062
commit c6fc9dcb51
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
legacy/elementary/ChangeLog
View File

@ -696,3 +696,10 @@
2012-11-22 Michael Bouchaud (yoz)
* fix elm_flip to show only one face at a time
2012-11-22 ChunEon Park (Hermet)
* Lets remove contents regardless of the preseve_on_set if naviframe is
deleted.

1
legacy/elementary/NEWS
View File

@ -60,6 +60,7 @@ Fixes:
* Fix the elm_image which is made up of a edje object can call a callback function
* Fix update the min size hint on elm_label after a text set
* Fix flip widget who show the two face at same time
* Fix the naviframe to delete contents which are preserved_on set if the naviframe is deleted.
Removals:

7
legacy/elementary/src/lib/elc_naviframe.c
View File

@ -84,7 +84,9 @@ _item_free(Elm_Naviframe_Item *it)
evas_object_del(it->title_next_btn);
if (it->title_icon) evas_object_del(it->title_icon);
if (sd->preserve && it->content)
if (it->content)
{
if ((sd->preserve) && (!sd->on_deletion))
{
/* so that elm does not delete the contents with the item's
* view after the del_pre_hook */
@ -92,8 +94,9 @@ _item_free(Elm_Naviframe_Item *it)
evas_object_event_callback_del
(it->content, EVAS_CALLBACK_DEL, _item_content_del_cb);
}
else if (it->content)
else
evas_object_del(it->content);
}
}
static void