enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

elementary/naviframe - new API elm_naviframe_item_promote 

SVN revision: 64353
This commit is contained in:
ChunEon Park 2011-10-24 06:35:48 +00:00
parent f7aaa3aeff
commit 4cad4f12a8
2 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
legacy/elementary/src/lib/Elementary.h.in
View File

@ -28148,6 +28148,17 @@ extern "C" {
* @ingroup Naviframe
*/
EAPI void elm_naviframe_item_pop_to(Elm_Object_Item *it) EINA_ARG_NONNULL(1);
/**
* Promote an item already in the naviframe stack to the top of the stack
*
* @param it The naviframe item
*
* This will take the indicated item and promote it to the top of the stack
* as if it had been pushed there. The item must already be inside the
* naviframe stack to work.
*
*/
EAPI void elm_naviframe_item_promote(Elm_Object_Item *it) EINA_ARG_NONNULL(1);
/**
* @brief Delete the given item instantly.
*

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

@ -148,7 +148,10 @@ _del_hook(Evas_Object *obj)
if (!wd) return;
EINA_INLIST_REVERSE_FOREACH(wd->stack, it)
_item_del(it);
{
wd->stack = eina_inlist_remove(wd->stack, EINA_INLIST_GET(it));
_item_del(it);
}
free(wd);
}
@ -716,8 +719,6 @@ _item_del(Elm_Naviframe_Item *it)
eina_stringshare_del(it->style);
wd->stack = eina_inlist_remove(wd->stack, EINA_INLIST_GET(it));
elm_widget_item_del(it);
}
@ -1026,6 +1027,7 @@ elm_naviframe_item_pop(Evas_Object *obj)
if (wd->stack->last->prev)
prev_it = EINA_INLIST_CONTAINER_GET(wd->stack->last->prev,
Elm_Naviframe_Item);
wd->stack = eina_inlist_remove(wd->stack, EINA_INLIST_GET(it));
if (prev_it)
{
if (wd->freeze_events)
@ -1060,12 +1062,41 @@ elm_naviframe_item_pop_to(Elm_Object_Item *it)
if (EINA_INLIST_CONTAINER_GET(l, Elm_Naviframe_Item) ==
((Elm_Naviframe_Item *) it)) break;
prev_l = l->prev;
wd->stack = eina_inlist_remove(wd->stack, l);
_item_del(EINA_INLIST_CONTAINER_GET(l, Elm_Naviframe_Item));
l = prev_l;
}
elm_naviframe_item_pop(WIDGET(navi_it));
}
EAPI void
elm_naviframe_item_promote(Elm_Object_Item *it)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
Elm_Naviframe_Item *prev_it = NULL;
Widget_Data *wd = elm_widget_data_get(navi_it->base.widget);
if (it == elm_naviframe_top_item_get(navi_it->base.widget)) return;
wd->stack = eina_inlist_demote(wd->stack, EINA_INLIST_GET(navi_it));
prev_it = EINA_INLIST_CONTAINER_GET(wd->stack->last->prev,
Elm_Naviframe_Item);
if (wd->freeze_events)
{
evas_object_show(wd->rect);
//FIXME:
evas_object_pass_events_set(wd->base, EINA_TRUE);
}
edje_object_signal_emit(prev_it->base.view,
"elm,state,cur,pushed",
"elm");
evas_object_show(navi_it->base.view);
evas_object_raise(navi_it->base.view);
edje_object_signal_emit(navi_it->base.view,
"elm,state,new,pushed",
"elm");
}
EAPI void
elm_naviframe_item_del(Elm_Object_Item *it)
{
@ -1074,6 +1105,7 @@ elm_naviframe_item_del(Elm_Object_Item *it)
Widget_Data *wd = elm_widget_data_get(WIDGET(navi_it));
if (it == elm_naviframe_top_item_get(WIDGET(navi_it)))
{
wd->stack = eina_inlist_remove(wd->stack, EINA_INLIST_GET(navi_it));
_item_del(navi_it);
navi_it = EINA_INLIST_CONTAINER_GET(wd->stack->last,
Elm_Naviframe_Item);
@ -1082,7 +1114,10 @@ elm_naviframe_item_del(Elm_Object_Item *it)
edje_object_signal_emit(VIEW(navi_it), "elm,state,visible", "elm");
}
else
_item_del(navi_it);
{
wd->stack = eina_inlist_remove(wd->stack, EINA_INLIST_GET(navi_it));
_item_del(navi_it);
}
}
EAPI void