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

Refactor genlist and deprecate top/middle item_show() API. 

Signed-off-by: Sanjeev BA <eflelev8@gmail.com>

SVN revision: 68898
This commit is contained in:
Sanjeev BA 2012-03-07 08:29:32 +00:00 committed by Sanjeev BA
parent 3946d4a76b
commit 1ece172c12
4 changed files with 90 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/elementary/src/bin/test_genlist.c
View File

@ -423,7 +423,7 @@ my_gl_first(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__
Evas_Object *gl = data;
Elm_Object_Item *gli = elm_genlist_first_item_get(gl);
if (!gli) return;
elm_genlist_item_show(gli);
elm_genlist_item_show(gli, ELM_GENLIST_ITEM_SCROLLTO_IN);
elm_genlist_item_selected_set(gli, 1);
}
@ -433,7 +433,7 @@ my_gl_last(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
Evas_Object *gl = data;
Elm_Object_Item *gli = elm_genlist_last_item_get(gl);
if (!gli) return;
elm_genlist_item_show(gli);
elm_genlist_item_show(gli, ELM_GENLIST_ITEM_SCROLLTO_IN);
elm_genlist_item_selected_set(gli, 1);
}

23
legacy/elementary/src/lib/elm_deprecated.h
View File

@ -5051,6 +5051,29 @@ EINA_DEPRECATED EAPI void elm_genlist_item_top_bring_in(Elm_Object_Item *it);
*/
EINA_DEPRECATED EAPI void elm_genlist_item_middle_bring_in(Elm_Object_Item *it);
/**
* Show the portion of a genlist's internal list containing a given
* item, immediately.
*
* @param it The item to display
*
* @deprecated elm_genlist_item_show()
*
*/
EINA_DEPRECATED EAPI void elm_genlist_item_top_show(Elm_Object_Item *it);
/**
* Show the portion of a genlist's internal list containing a given
* item, immediately.
*
* @param it The item to display
*
* @deprecated elm_genlist_item_show()
*
*/
EINA_DEPRECATED EAPI void elm_genlist_item_middle_show(Elm_Object_Item *it);
/**
* @}
*/

177
legacy/elementary/src/lib/elm_genlist.c
View File

@ -427,12 +427,12 @@ _item_multi_select_up(Widget_Data *wd)
{
elm_genlist_item_selected_set(wd->last_selected_item, EINA_FALSE);
wd->last_selected_item = prev;
elm_genlist_item_show(wd->last_selected_item);
elm_genlist_item_show(wd->last_selected_item, ELM_GENLIST_ITEM_SCROLLTO_IN);
}
else
{
elm_genlist_item_selected_set(prev, EINA_TRUE);
elm_genlist_item_show(prev);
elm_genlist_item_show(prev, ELM_GENLIST_ITEM_SCROLLTO_IN);
}
return EINA_TRUE;
}
@ -451,12 +451,12 @@ _item_multi_select_down(Widget_Data *wd)
{
elm_genlist_item_selected_set(wd->last_selected_item, EINA_FALSE);
wd->last_selected_item = next;
elm_genlist_item_show(wd->last_selected_item);
elm_genlist_item_show(wd->last_selected_item, ELM_GENLIST_ITEM_SCROLLTO_IN);
}
else
{
elm_genlist_item_selected_set(next, EINA_TRUE);
elm_genlist_item_show(next);
elm_genlist_item_show(next, ELM_GENLIST_ITEM_SCROLLTO_IN);
}
return EINA_TRUE;
}
@ -478,7 +478,7 @@ _item_single_select_up(Widget_Data *wd)
_deselect_all_items(wd);
elm_genlist_item_selected_set((Elm_Object_Item *) prev, EINA_TRUE);
elm_genlist_item_show((Elm_Object_Item *) prev);
elm_genlist_item_show((Elm_Object_Item *) prev, ELM_GENLIST_ITEM_SCROLLTO_IN);
return EINA_TRUE;
}
@ -499,7 +499,7 @@ _item_single_select_down(Widget_Data *wd)
_deselect_all_items(wd);
elm_genlist_item_selected_set((Elm_Object_Item *) next, EINA_TRUE);
elm_genlist_item_show((Elm_Object_Item *) next);
elm_genlist_item_show((Elm_Object_Item *) next, ELM_GENLIST_ITEM_SCROLLTO_IN);
return EINA_TRUE;
}
@ -4717,33 +4717,56 @@ elm_genlist_item_display_only_get(const Elm_Object_Item *it)
return _it->display_only;
}
EAPI void
elm_genlist_item_show(Elm_Object_Item *it)
static Eina_Bool _elm_genlist_item_compute_coordinates(
Elm_Object_Item *it,
Elm_Genlist_Item_Scrollto_Type type,
Evas_Coord *x,
Evas_Coord *y,
Evas_Coord *w,
Evas_Coord *h)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
Evas_Coord gith = 0;
if (_it->generation < _it->wd->generation) return;
if (_it->generation < _it->wd->generation) return EINA_FALSE;
if ((_it->item->queued) || (!_it->item->mincalcd))
{
_it->wd->show_item = _it;
_it->wd->bring_in = EINA_FALSE;
_it->wd->scrollto_type = ELM_GENLIST_ITEM_SCROLLTO_IN;
_it->wd->scrollto_type = type;
_it->item->showme = EINA_TRUE;
return;
return EINA_FALSE;
}
if (_it->wd->show_item)
{
_it->wd->show_item->item->showme = EINA_FALSE;
_it->wd->show_item = NULL;
}
if ((_it->item->group_item) &&
(_it->wd->pan_y > (_it->y + _it->item->block->y)))
gith = _it->item->group_item->item->h;
elm_smart_scroller_child_region_show(_it->wd->scr,
_it->x + _it->item->block->x,
_it->y + _it->item->block->y - gith,
_it->item->block->w, _it->item->h);
evas_object_geometry_get(_it->wd->pan_smart, NULL, NULL, w, h);
if (type==ELM_GENLIST_ITEM_SCROLLTO_IN)
{
if ((_it->item->group_item) &&
(_it->wd->pan_y > (_it->y + _it->item->block->y)))
gith = _it->item->group_item->item->h;
*h = _it->item->h;
*y = _it->y + _it->item->block->y - gith;
}
else if (type==ELM_GENLIST_ITEM_SCROLLTO_TOP)
{
if (_it->item->group_item) gith = _it->item->group_item->item->h;
*y = _it->y + _it->item->block->y - gith;
}
else if (type==ELM_GENLIST_ITEM_SCROLLTO_MIDDLE)
{
*y = _it->y + _it->item->block->y - *h / 2 + _it->item->h / 2;
}
else
return EINA_FALSE;
*x = _it->x + _it->item->block->x;
*w = _it->item->block->w;
return EINA_TRUE;
}
EAPI void
@ -4766,124 +4789,48 @@ elm_genlist_item_demote(Elm_Object_Item *it)
(Elm_Gen_Item *) elm_genlist_last_item_get(WIDGET(_it)));
}
EAPI void
elm_genlist_item_show(Elm_Object_Item *it, Elm_Genlist_Item_Scrollto_Type type)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Evas_Coord x, y, w, h;
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
if (_elm_genlist_item_compute_coordinates(it, type, &x, &y, &w, &h))
elm_smart_scroller_child_region_show(_it->wd->scr, x, y, w, h);
}
EAPI void
elm_genlist_item_bring_in(Elm_Object_Item *it, Elm_Genlist_Item_Scrollto_Type type)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
Evas_Coord x, y, w, h;
Evas_Coord gith = 0;
if (_it->generation < _it->wd->generation) return;
if ((_it->item->queued) || (!_it->item->mincalcd))
{
_it->wd->show_item = _it;
_it->wd->bring_in = EINA_TRUE;
_it->wd->scrollto_type = type;
_it->item->showme = EINA_TRUE;
return;
}
if (_it->wd->show_item)
{
_it->wd->show_item->item->showme = EINA_FALSE;
_it->wd->show_item = NULL;
}
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
x = _it->x + _it->item->block->x;
if (type==ELM_GENLIST_ITEM_SCROLLTO_IN)
{
if ((_it->item->group_item) &&
(_it->wd->pan_y > (_it->y + _it->item->block->y)))
gith = _it->item->group_item->item->h;
w = _it->item->block->w;
h = _it->item->h;
y = _it->y + _it->item->block->y - gith;
}
else if (type==ELM_GENLIST_ITEM_SCROLLTO_TOP)
{
evas_object_geometry_get(_it->wd->pan_smart, NULL, NULL, &w, &h);
if (_it->item->group_item) gith = _it->item->group_item->item->h;
y = _it->y + _it->item->block->y - gith;
}
else if (type==ELM_GENLIST_ITEM_SCROLLTO_MIDDLE)
{
evas_object_geometry_get(_it->wd->pan_smart, NULL, NULL, &w, &h);
w = _it->item->block->w;
y = _it->y + _it->item->block->y - h / 2 + _it->item->h / 2;
}
else
return;
elm_smart_scroller_region_bring_in(_it->wd->scr,x, y, w, h);
if (_elm_genlist_item_compute_coordinates(it, type, &x, &y, &w, &h))
elm_smart_scroller_region_bring_in(_it->wd->scr,x, y, w, h);
}
EAPI void
EINA_DEPRECATED EAPI void
elm_genlist_item_top_show(Elm_Object_Item *it)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
Evas_Coord ow, oh;
Evas_Coord gith = 0;
if (_it->generation < _it->wd->generation) return;
if ((_it->item->queued) || (!_it->item->mincalcd))
{
_it->wd->show_item = _it;
_it->wd->bring_in = EINA_FALSE;
_it->wd->scrollto_type = ELM_GENLIST_ITEM_SCROLLTO_TOP;
_it->item->showme = EINA_TRUE;
return;
}
if (_it->wd->show_item)
{
_it->wd->show_item->item->showme = EINA_FALSE;
_it->wd->show_item = NULL;
}
evas_object_geometry_get(_it->wd->pan_smart, NULL, NULL, &ow, &oh);
if (_it->item->group_item) gith = _it->item->group_item->item->h;
elm_smart_scroller_child_region_show(_it->wd->scr,
_it->x + _it->item->block->x,
_it->y + _it->item->block->y - gith,
_it->item->block->w, oh);
elm_genlist_item_show(it, ELM_GENLIST_ITEM_SCROLLTO_TOP);
}
EAPI void
EINA_DEPRECATED EAPI void
elm_genlist_item_top_bring_in(Elm_Object_Item *it)
{
elm_genlist_item_bring_in(it, ELM_GENLIST_ITEM_SCROLLTO_TOP);
}
EAPI void
EINA_DEPRECATED EAPI void
elm_genlist_item_middle_show(Elm_Object_Item *it)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
Evas_Coord ow, oh;
if (_it->generation < _it->wd->generation) return;
if ((_it->item->queued) || (!_it->item->mincalcd))
{
_it->wd->show_item = _it;
_it->wd->bring_in = EINA_FALSE;
_it->wd->scrollto_type = ELM_GENLIST_ITEM_SCROLLTO_MIDDLE;
_it->item->showme = EINA_TRUE;
return;
}
if (_it->wd->show_item)
{
_it->wd->show_item->item->showme = EINA_FALSE;
_it->wd->show_item = NULL;
}
evas_object_geometry_get(_it->wd->pan_smart, NULL, NULL, &ow, &oh);
elm_smart_scroller_child_region_show(_it->wd->scr,
_it->x + _it->item->block->x,
_it->y + _it->item->block->y - oh / 2 +
_it->item->h / 2, _it->item->block->w,
oh);
elm_genlist_item_show(it, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE);
}
EAPI void
EINA_DEPRECATED EAPI void
elm_genlist_item_middle_bring_in(Elm_Object_Item *it)
{
elm_genlist_item_bring_in(it, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE);

45
legacy/elementary/src/lib/elm_genlist.h
View File

@ -908,18 +908,17 @@ EAPI Eina_Bool elm_genlist_item_selected_get(const Elm_Objec
* item, immediately.
*
* @param it The item to display
* @param type The position to bring in, the given item to.
* @ref Elm_Genlist_Item_Scrollto_Type
*
* This causes genlist to jump to the given item @p it and show it (by
* jumping to that position), if it is not fully visible.
*
* @see elm_genlist_item_bring_in()
* @see elm_genlist_item_top_show()
* @see elm_genlist_item_middle_show()
*
* @ingroup Genlist
*/
//XXX: elm_genlist_item_show(it, TOP/MIDDLE/BOTTOM/...); this kind of API would cover all similar APIs - item_show, item_top_show...
EAPI void elm_genlist_item_show(Elm_Object_Item *it);
EAPI void elm_genlist_item_show(Elm_Object_Item *it, Elm_Genlist_Item_Scrollto_Type type);
/**
* Animatedly bring in, to the visible are of a genlist, a given
@ -939,44 +938,6 @@ EAPI void elm_genlist_item_show(Elm_Object_Item *it);
*/
EAPI void elm_genlist_item_bring_in(Elm_Object_Item *it, Elm_Genlist_Item_Scrollto_Type type);
/**
* Show the portion of a genlist's internal list containing a given
* item, immediately.
*
* @param it The item to display
*
* This causes genlist to jump to the given item @p it and show it (by
* jumping to the top position), if it is not fully visible.
*
* The item will be positioned at the top of the genlist viewport.
*
* @see elm_genlist_item_show()
* @see elm_genlist_item_bring_in()
*
* @ingroup Genlist
*/
//XXX: elm_genlist_item_show(it, TOP/MIDDLE/BOTTOM/...); this kind of API would cover all similar APIs - item_show, item_top_show...
EAPI void elm_genlist_item_top_show(Elm_Object_Item *it);
/**
* Show the portion of a genlist's internal list containing a given
* item, immediately.
*
* @param it The item to display
*
* This causes genlist to jump to the given item @p it and show it (by
* immediately scrolling to that position), if it is not fully visible.
*
* The item will be positioned at the middle of the genlist viewport.
*
* @see elm_genlist_item_show()
* @see elm_genlist_item_bring_in()
*
* @ingroup Genlist
*/
//XXX: elm_genlist_item_show(it, TOP/MIDDLE/BOTTOM/...); this kind of API would cover all similar APIs - item_show, item_top_show...
EAPI void elm_genlist_item_middle_show(Elm_Object_Item *it);
/**
* Update the contents of an item
*