forked from enlightenment/efl
elementary/naviframe - let's remove contents which are preserved on set if the naviframe is deleted.
SVN revision: 79541
This commit is contained in:
parent
5a4de3b062
commit
c6fc9dcb51
|
@ -695,4 +695,11 @@
|
||||||
|
|
||||||
2012-11-22 Michael Bouchaud (yoz)
|
2012-11-22 Michael Bouchaud (yoz)
|
||||||
|
|
||||||
* fix elm_flip to show only one face at a time
|
* 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.
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -60,6 +60,7 @@ Fixes:
|
||||||
* Fix the elm_image which is made up of a edje object can call a callback function
|
* 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 update the min size hint on elm_label after a text set
|
||||||
* Fix flip widget who show the two face at same time
|
* 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:
|
Removals:
|
||||||
|
|
||||||
|
|
|
@ -84,16 +84,19 @@ _item_free(Elm_Naviframe_Item *it)
|
||||||
evas_object_del(it->title_next_btn);
|
evas_object_del(it->title_next_btn);
|
||||||
if (it->title_icon) evas_object_del(it->title_icon);
|
if (it->title_icon) evas_object_del(it->title_icon);
|
||||||
|
|
||||||
if (sd->preserve && it->content)
|
if (it->content)
|
||||||
{
|
{
|
||||||
/* so that elm does not delete the contents with the item's
|
if ((sd->preserve) && (!sd->on_deletion))
|
||||||
* view after the del_pre_hook */
|
{
|
||||||
edje_object_part_unswallow(VIEW(it), it->content);
|
/* so that elm does not delete the contents with the item's
|
||||||
evas_object_event_callback_del
|
* view after the del_pre_hook */
|
||||||
(it->content, EVAS_CALLBACK_DEL, _item_content_del_cb);
|
edje_object_part_unswallow(VIEW(it), it->content);
|
||||||
|
evas_object_event_callback_del
|
||||||
|
(it->content, EVAS_CALLBACK_DEL, _item_content_del_cb);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
evas_object_del(it->content);
|
||||||
}
|
}
|
||||||
else if (it->content)
|
|
||||||
evas_object_del(it->content);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue