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

elementary/naviframe : Remove dummy_edje. Naviframe should be shown with at least one item, and don't have to care about the state there is no item. 

Additionally, it's not a smart member of naviframe, there is no guarantee when this object will be deleted.


SVN revision: 80628
This commit is contained in:
WooHyun Jung 2012-12-11 07:33:27 +00:00
parent 7e45660338
commit 5a7e0de603
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/elementary/ChangeLog
View File

@ -802,3 +802,7 @@
* Make sure private data is not NULL in elm_interface_scrollable.
* Correctly handle failure case in _x11_notify_handler_image.
* Fix missuse of EINA_INLIST_FOREACH in elm_transit.c.
2012-12-11 WooHyun Jung
* Remove dummy object from elm_naviframe.

1
legacy/elementary/NEWS
View File

@ -89,6 +89,7 @@ Fixes:
* Make sure private data is not NULL in elm_interface_scrollable.
* Correctly handle failure case in _x11_notify_handler_image.
* Don't manipulate dead memory in Eina_Inlist in elm_transit.c.
* Remove dummy object from elm_naviframe.
Removals:

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

@ -466,7 +466,6 @@ _item_del_pre_hook(Elm_Object_Item *it)
(sd->stack->last->prev, Elm_Naviframe_Item);
sd->stack = eina_inlist_remove(sd->stack, EINA_INLIST_GET(nit));
if (!sd->stack) elm_widget_resize_object_set(WIDGET(it), sd->dummy_edje);
if (top && !sd->on_deletion) /* must raise another one */
{
@ -1244,10 +1243,6 @@ static void
_elm_naviframe_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Naviframe_Smart_Data *priv = _pd;
Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
priv->dummy_edje = wd->resize_obj =
edje_object_add(evas_object_evas_get(obj));
eo_do_super(obj, evas_obj_smart_add());
@ -1304,8 +1299,6 @@ _elm_naviframe_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
sd->on_deletion = EINA_FALSE;
evas_object_del(sd->dummy_edje);
eo_do_super(obj, evas_obj_smart_del());
}
@ -1587,7 +1580,6 @@ _item_pop(Eo *obj, void *_pd, va_list *list)
(sd->stack->last->prev, Elm_Naviframe_Item);
sd->stack = eina_inlist_remove(sd->stack, EINA_INLIST_GET(it));
if (!sd->stack) elm_widget_resize_object_set(obj, sd->dummy_edje);
if (prev_it)
{