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

gengrid more genlist-like. 

use inlist so we don't have to find stuff to operate on.

export more methods, like elm_gengrid_item_next_get(),
elm_gengrid_item_prev_get() and elm_gengrid_first_item_get() and elm_gengrid_last_item_get()... so we don't expose elm_gengrid_items_get().

People using the old elm_gengrid_items_get() should move to
elm_gengrid_first_item_get() and then next variant.



SVN revision: 53248
This commit is contained in:
Gustavo Sverzut Barbieri 2010-10-10 23:54:11 +00:00
parent 0090ce210c
commit ada8ac0f82
3 changed files with 268 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -672,9 +672,6 @@ extern "C" {
EAPI void elm_gengrid_item_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
EAPI void elm_gengrid_align_set(Evas_Object *obj, double align_x, double align_y);
EAPI void elm_gengrid_align_get(const Evas_Object *obj, double *align_x, double *align_y);
EAPI void elm_gengrid_item_del(Elm_Gengrid_Item *item);
EAPI void elm_gengrid_item_update(Elm_Gengrid_Item *item);
EAPI void elm_gengrid_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select);
EAPI Eina_Bool elm_gengrid_always_select_mode_get(const Evas_Object *obj);
@ -687,6 +684,25 @@ extern "C" {
EAPI void elm_gengrid_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel);
EAPI void elm_gengrid_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize);
EAPI void elm_gengrid_horizontal_set(Evas_Object *obj, Eina_Bool setting);
EAPI Elm_Gengrid_Item *elm_gengrid_first_item_get(const Evas_Object *obj);
EAPI Elm_Gengrid_Item *elm_gengrid_last_item_get(const Evas_Object *obj);
EAPI Elm_Gengrid_Item *elm_gengrid_item_next_get(const Elm_Gengrid_Item *item);
EAPI Elm_Gengrid_Item *elm_gengrid_item_prev_get(const Elm_Gengrid_Item *item);
EAPI Evas_Object *elm_gengrid_item_gengrid_get(const Elm_Gengrid_Item *item);
EAPI void elm_gengrid_item_del(Elm_Gengrid_Item *item);
EAPI void elm_gengrid_item_update(Elm_Gengrid_Item *item);
EAPI void *elm_gengrid_item_data_get(const Elm_Gengrid_Item *item);
EAPI void elm_gengrid_item_data_set(Elm_Gengrid_Item *item, const void *data);
EAPI void elm_gengrid_item_pos_get(const Elm_Gengrid_Item *item, unsigned int *x, unsigned int *y);
EAPI void elm_gengrid_item_selected_set(Elm_Gengrid_Item *item, Eina_Bool selected);
EAPI Eina_Bool elm_gengrid_item_selected_get(const Elm_Gengrid_Item *item);
EAPI const Evas_Object *elm_gengrid_item_object_get(const Elm_Gengrid_Item *item);
EAPI void elm_gengrid_item_show(Elm_Gengrid_Item *item);
EAPI void elm_gengrid_item_bring_in(Elm_Gengrid_Item *item);
EAPI void elm_gengrid_item_tooltip_text_set(Elm_Gengrid_Item *item, const char *text);
EAPI void elm_gengrid_item_tooltip_content_cb_set(Elm_Gengrid_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
EAPI void elm_gengrid_item_tooltip_unset(Elm_Gengrid_Item *item);
@ -700,20 +716,13 @@ extern "C" {
EAPI Eina_Bool elm_gengrid_item_cursor_engine_only_get(const Elm_Gengrid_Item *item);
EAPI void elm_gengrid_clear(Evas_Object *obj);
EAPI void *elm_gengrid_item_data_get(const Elm_Gengrid_Item *item);
EAPI void elm_gengrid_item_pos_get(const Elm_Gengrid_Item *item, unsigned int *x, unsigned int *y);
EAPI void elm_gengrid_item_selected_set(Elm_Gengrid_Item *item, Eina_Bool selected);
EAPI Eina_Bool elm_gengrid_item_selected_get(const Elm_Gengrid_Item *item);
EAPI const Evas_Object *elm_gengrid_item_object_get(const Elm_Gengrid_Item *item);
EAPI Elm_Gengrid_Item *elm_gengrid_selected_item_get(const Evas_Object *obj);
EAPI const Eina_List *elm_gengrid_selected_items_get(const Evas_Object *obj);
EAPI const Eina_List *elm_gengrid_items_get(const Evas_Object *obj);
EAPI Elm_Gengrid_Item *elm_gengrid_item_append(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Evas_Smart_Cb func, const void *func_data);
EAPI Elm_Gengrid_Item *elm_gengrid_item_prepend(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Evas_Smart_Cb func, const void *func_data);
EAPI Elm_Gengrid_Item *elm_gengrid_item_insert_before(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, const Elm_Gengrid_Item *relative, Evas_Smart_Cb func, const void *func_data);
EAPI Elm_Gengrid_Item *elm_gengrid_item_insert_after(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, const Elm_Gengrid_Item *relative, Evas_Smart_Cb func, const void *func_data);
EAPI void elm_gengrid_item_show(Elm_Gengrid_Item *item);
EAPI void elm_gengrid_item_bring_in(Elm_Gengrid_Item *item);
EAPI Elm_Gengrid_Item *elm_gengrid_item_insert_before(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Elm_Gengrid_Item *relative, Evas_Smart_Cb func, const void *func_data);
EAPI Elm_Gengrid_Item *elm_gengrid_item_insert_after(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Elm_Gengrid_Item *relative, Evas_Smart_Cb func, const void *func_data);
/* smart callbacks called:
*
* selected - User has selected a item.

377
legacy/elementary/src/lib/elm_gengrid.c
View File

@ -144,6 +144,7 @@ typedef struct _Pan Pan;
struct _Elm_Gengrid_Item
{
Elm_Widget_Item base;
EINA_INLIST;
Evas_Object *spacer;
const Elm_Gengrid_Item_Class *gic;
Ecore_Timer *long_timer;
@ -157,6 +158,7 @@ struct _Elm_Gengrid_Item
Evas_Coord x, y, dx, dy;
int relcount;
int walking;
struct
{
@ -177,7 +179,6 @@ struct _Elm_Gengrid_Item
Eina_Bool disabled : 1;
Eina_Bool selected : 1;
Eina_Bool hilighted : 1;
Eina_Bool walking : 1;
};
struct _Widget_Data
@ -185,7 +186,7 @@ struct _Widget_Data
Evas_Object *self, *scr;
Evas_Object *pan_smart;
Pan *pan;
Eina_List *items;
Eina_Inlist *items;
Ecore_Job *calc_job;
Eina_List *selected;
Elm_Gengrid_Item *last_selected_item;
@ -195,6 +196,8 @@ struct _Widget_Data
Evas_Coord item_width, item_height; /* Each item size */
Evas_Coord minw, minh; /* Total obj size */
unsigned int nmax;
long count;
int walking;
Eina_Bool horizontal : 1;
Eina_Bool on_hold : 1;
@ -203,8 +206,12 @@ struct _Widget_Data
Eina_Bool no_select : 1;
Eina_Bool wasselected : 1;
Eina_Bool always_select : 1;
Eina_Bool clear_me : 1;
};
#define ELM_GENGRID_ITEM_FROM_INLIST(item) \
((item) ? EINA_INLIST_CONTAINER_GET(item, Elm_Gengrid_Item) : NULL)
struct _Pan
{
Evas_Object_Smart_Clipped_Data __clipped_data;
@ -305,15 +312,14 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
}
else if (!strcmp(ev->keyname, "Home"))
{
it = eina_list_data_get(wd->items);
it = elm_gengrid_first_item_get(obj);
elm_gengrid_item_bring_in(it);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
return EINA_TRUE;
}
else if (!strcmp(ev->keyname, "End"))
{
Eina_List *l = eina_list_last(wd->items);
it = eina_list_data_get(l);
it = elm_gengrid_last_item_get(obj);
elm_gengrid_item_bring_in(it);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
return EINA_TRUE;
@ -339,72 +345,13 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
return EINA_TRUE;
}
static Eina_Bool
_item_multi_select_up(Widget_Data *wd)
{
unsigned int i;
if (!wd->selected) return EINA_FALSE;
Eina_List *l = eina_list_data_find_list(wd->items, wd->last_selected_item);
Elm_Gengrid_Item *prev = NULL;
l = eina_list_prev(l);
for (i = 0; i < wd->nmax && l; i++, l = eina_list_prev(l))
{
prev = eina_list_data_get(l);
if (elm_gengrid_item_selected_get(prev))
{
elm_gengrid_item_selected_set(wd->last_selected_item, EINA_FALSE);
wd->last_selected_item = prev;
elm_gengrid_item_show(wd->last_selected_item);
}
else
{
elm_gengrid_item_selected_set(prev, EINA_TRUE);
elm_gengrid_item_show(prev);
}
}
return EINA_TRUE;
}
static Eina_Bool
_item_multi_select_down(Widget_Data *wd)
{
unsigned int i;
if (!wd->selected) return EINA_FALSE;
Eina_List *l = eina_list_data_find_list(wd->items, wd->last_selected_item);
Elm_Gengrid_Item *next = NULL;
l = eina_list_next(l);
for (i = 0; i < wd->nmax && l; i++, l = eina_list_next(l))
{
next = eina_list_data_get(l);
if (elm_gengrid_item_selected_get(next))
{
elm_gengrid_item_selected_set(wd->last_selected_item, EINA_FALSE);
wd->last_selected_item = next;
elm_gengrid_item_show(wd->last_selected_item);
}
else
{
elm_gengrid_item_selected_set(next, EINA_TRUE);
elm_gengrid_item_show(next);
}
}
return EINA_TRUE;
}
static Eina_Bool
_item_multi_select_left(Widget_Data *wd)
{
if (!wd->selected) return EINA_FALSE;
Eina_List *l = eina_list_data_find_list(wd->items, wd->last_selected_item);
l = eina_list_prev(l);
if (!l) return EINA_TRUE;
Elm_Gengrid_Item *prev = eina_list_data_get(l);
Elm_Gengrid_Item *prev = elm_gengrid_item_prev_get(wd->last_selected_item);
if (!prev) return EINA_TRUE;
if (elm_gengrid_item_selected_get(prev))
{
elm_gengrid_item_selected_set(wd->last_selected_item, EINA_FALSE);
@ -425,11 +372,8 @@ _item_multi_select_right(Widget_Data *wd)
{
if (!wd->selected) return EINA_FALSE;
Eina_List *l = eina_list_data_find_list(wd->items, wd->last_selected_item);
l = eina_list_next(l);
if (!l) return EINA_TRUE;
Elm_Gengrid_Item *next = eina_list_data_get(l);
Elm_Gengrid_Item *next = elm_gengrid_item_next_get(wd->last_selected_item);
if (!next) return EINA_TRUE;
if (elm_gengrid_item_selected_get(next))
{
elm_gengrid_item_selected_set(wd->last_selected_item, EINA_FALSE);
@ -445,21 +389,52 @@ _item_multi_select_right(Widget_Data *wd)
return EINA_TRUE;
}
static Eina_Bool
_item_multi_select_up(Widget_Data *wd)
{
unsigned int i;
Eina_Bool r = EINA_TRUE;
if (!wd->selected) return EINA_FALSE;
for (i = 0; r && i < wd->nmax; i++)
r &= _item_multi_select_left(wd);
return r;
}
static Eina_Bool
_item_multi_select_down(Widget_Data *wd)
{
unsigned int i;
Eina_Bool r = EINA_TRUE;
if (!wd->selected) return EINA_FALSE;
for (i = 0; r && i < wd->nmax; i++)
r &= _item_multi_select_right(wd);
return r;
}
static Eina_Bool
_item_single_select_up(Widget_Data *wd)
{
unsigned int i;
if (!wd->selected) return EINA_FALSE;
Elm_Gengrid_Item *prev = elm_gengrid_item_prev_get(wd->last_selected_item);
if (!prev) return EINA_FALSE;
Eina_List *l = eina_list_data_find_list(wd->items, wd->last_selected_item);
for (i = 0; i < wd->nmax && l; i++)
l = eina_list_prev(l);
if (!l) return EINA_FALSE;
while (wd->selected)
elm_gengrid_item_selected_set(wd->selected->data, EINA_FALSE);
Elm_Gengrid_Item *prev = eina_list_data_get(l);
while(wd->selected)
elm_gengrid_item_selected_set(eina_list_data_get(wd->selected),
EINA_FALSE);
for (i = 1; i < wd->nmax; i++)
{
Elm_Gengrid_Item *tmp = elm_gengrid_item_prev_get(prev);
if (!tmp) break;
prev = tmp;
}
elm_gengrid_item_selected_set(prev, EINA_TRUE);
elm_gengrid_item_show(prev);
@ -470,17 +445,20 @@ static Eina_Bool
_item_single_select_down(Widget_Data *wd)
{
unsigned int i;
if (!wd->selected) return EINA_FALSE;
Elm_Gengrid_Item *next = elm_gengrid_item_next_get(wd->last_selected_item);
if (!next) return EINA_FALSE;
Eina_List *l = eina_list_data_find_list(wd->items, wd->last_selected_item);
for (i = 0; i < wd->nmax && l; i++)
l = eina_list_next(l);
if (!l) return EINA_FALSE;
while (wd->selected)
elm_gengrid_item_selected_set(wd->selected->data, EINA_FALSE);
Elm_Gengrid_Item *next = eina_list_data_get(l);
while(wd->selected)
elm_gengrid_item_selected_set(eina_list_data_get(wd->selected),
EINA_FALSE);
for (i = 1; i < wd->nmax; i++)
{
Elm_Gengrid_Item *tmp = elm_gengrid_item_next_get(next);
if (!tmp) break;
next = tmp;
}
elm_gengrid_item_selected_set(next, EINA_TRUE);
elm_gengrid_item_show(next);
@ -491,15 +469,11 @@ static Eina_Bool
_item_single_select_left(Widget_Data *wd)
{
if (!wd->selected) return EINA_FALSE;
Elm_Gengrid_Item *prev = elm_gengrid_item_prev_get(wd->last_selected_item);
if (!prev) return EINA_FALSE;
Eina_List *l = eina_list_data_find_list(wd->items, wd->last_selected_item);
l = eina_list_prev(l);
if (!l) return EINA_FALSE;
Elm_Gengrid_Item *prev = eina_list_data_get(l);
while(wd->selected)
elm_gengrid_item_selected_set(eina_list_data_get(wd->selected),
EINA_FALSE);
while (wd->selected)
elm_gengrid_item_selected_set(wd->selected->data, EINA_FALSE);
elm_gengrid_item_selected_set(prev, EINA_TRUE);
elm_gengrid_item_show(prev);
@ -510,15 +484,11 @@ static Eina_Bool
_item_single_select_right(Widget_Data *wd)
{
if (!wd->selected) return EINA_FALSE;
Elm_Gengrid_Item *next = elm_gengrid_item_next_get(wd->last_selected_item);
if (!next) return EINA_FALSE;
Eina_List *l = eina_list_data_find_list(wd->items, wd->last_selected_item);
l = eina_list_next(l);
if (!l) return EINA_FALSE;
Elm_Gengrid_Item *next = eina_list_data_get(l);
while(wd->selected)
elm_gengrid_item_selected_set(eina_list_data_get(wd->selected),
EINA_FALSE);
while (wd->selected)
elm_gengrid_item_selected_set(wd->selected->data, EINA_FALSE);
elm_gengrid_item_selected_set(next, EINA_TRUE);
elm_gengrid_item_show(next);
@ -963,8 +933,8 @@ _item_place(Elm_Gengrid_Item *item, Evas_Coord cx, Evas_Coord cy)
if (items_visible < 1)
items_visible = 1;
columns = eina_list_count(item->wd->items) / items_visible;
if (eina_list_count(item->wd->items) % items_visible)
columns = item->wd->count / items_visible;
if (item->wd->count % items_visible)
columns++;
tcw = item->wd->item_width * columns;
@ -980,8 +950,8 @@ _item_place(Elm_Gengrid_Item *item, Evas_Coord cx, Evas_Coord cy)
if (items_visible < 1)
items_visible = 1;
rows = eina_list_count(item->wd->items)/ items_visible;
if (eina_list_count(item->wd->items) % items_visible)
rows = item->wd->count / items_visible;
if (item->wd->count % items_visible)
rows++;
tch = item->wd->item_height * rows;
@ -1015,6 +985,7 @@ _item_create(Widget_Data *wd, const Elm_Gengrid_Item_Class *gic, const void *dat
item = elm_widget_item_new(wd->self, Elm_Gengrid_Item);
if (!item) return NULL;
wd->count++;
item->wd = wd;
item->gic = gic;
item->base.data = data;
@ -1034,11 +1005,13 @@ _item_del(Elm_Gengrid_Item *item)
if ((!item->delete_me) && (item->gic->func.del))
item->gic->func.del((void *)item->base.data, item->wd->self);
item->delete_me = EINA_TRUE;
item->wd->items = eina_list_remove(item->wd->items, item);
item->wd->items = eina_inlist_remove(item->wd->items, EINA_INLIST_GET(item));
if (item->long_timer) ecore_timer_del(item->long_timer);
elm_widget_item_del(item);
if (item->tooltip.del_cb)
item->tooltip.del_cb((void *)item->tooltip.data, item->base.widget, item);
item->wd->walking == item->walking;
item->wd->count--;
elm_widget_item_del(item);
}
static void
@ -1054,13 +1027,20 @@ _item_select(Elm_Gengrid_Item *item)
item->wd->selected = eina_list_append(item->wd->selected, item);
call:
item->walking++;
if (item->func.func)
item->wd->walking++;
if (item->func.func)
item->func.func((void *)item->func.data, item->wd->self, item);
if (!item->delete_me)
evas_object_smart_callback_call(item->wd->self, "selected", item);
item->walking--;
if ((item->walking == 0) && (item->delete_me))
if (item->relcount == 0) _item_del(item);
item->wd->walking--;
if ((item->wd->clear_me) && (item->wd->walking == 0))
elm_gengrid_clear(item->base.widget);
else
{
if ((item->walking == 0) && (item->delete_me))
if (item->relcount == 0) _item_del(item);
}
item->wd->last_selected_item = item;
}
@ -1094,7 +1074,7 @@ _calc_job(void *data)
if (nmax < 1)
nmax = 1;
count = eina_list_count(wd->items);
count = wd->count;
if (wd->horizontal)
{
minw = ceil(count / (float)nmax) * wd->item_width;
@ -1199,13 +1179,12 @@ _pan_calculate(Evas_Object *obj)
{
Pan *sd = evas_object_smart_data_get(obj);
Evas_Coord cx = 0, cy = 0;
Eina_List *l;
Elm_Gengrid_Item *item;
if (!sd) return;
if (!sd->wd->nmax) return;
EINA_LIST_FOREACH(sd->wd->items, l, item)
EINA_INLIST_FOREACH(sd->wd->items, item)
{
_item_place(item, cx, cy);
if (sd->wd->horizontal)
@ -1491,7 +1470,7 @@ elm_gengrid_item_append(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic,
item = _item_create(wd, gic, data, func, func_data);
if (!item) return NULL;
wd->items = eina_list_append(wd->items, item);
wd->items = eina_inlist_append(wd->items, EINA_INLIST_GET(item));
if (wd->calc_job) ecore_job_del(wd->calc_job);
wd->calc_job = ecore_job_add(_calc_job, wd);
@ -1530,7 +1509,7 @@ elm_gengrid_item_prepend(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic,
item = _item_create(wd, gic, data, func, func_data);
if (!item) return NULL;
wd->items = eina_list_prepend(wd->items, item);
wd->items = eina_inlist_prepend(wd->items, EINA_INLIST_GET(item));
if (wd->calc_job) ecore_job_del(wd->calc_job);
wd->calc_job = ecore_job_add(_calc_job, wd);
@ -1562,7 +1541,7 @@ EAPI Elm_Gengrid_Item *
elm_gengrid_item_insert_before(Evas_Object *obj,
const Elm_Gengrid_Item_Class *gic,
const void *data,
const Elm_Gengrid_Item *relative,
Elm_Gengrid_Item *relative,
Evas_Smart_Cb func, const void *func_data)
{
Elm_Gengrid_Item *item;
@ -1572,7 +1551,8 @@ elm_gengrid_item_insert_before(Evas_Object *obj,
item = _item_create(wd, gic, data, func, func_data);
if (!item) return NULL;
wd->items = eina_list_prepend_relative(wd->items, item, relative);
wd->items = eina_inlist_prepend_relative
(wd->items, EINA_INLIST_GET(item), EINA_INLIST_GET(relative));
if (wd->calc_job) ecore_job_del(wd->calc_job);
wd->calc_job = ecore_job_add(_calc_job, wd);
@ -1604,7 +1584,7 @@ EAPI Elm_Gengrid_Item *
elm_gengrid_item_insert_after(Evas_Object *obj,
const Elm_Gengrid_Item_Class *gic,
const void *data,
const Elm_Gengrid_Item *relative,
Elm_Gengrid_Item *relative,
Evas_Smart_Cb func, const void *func_data)
{
Elm_Gengrid_Item *item;
@ -1614,7 +1594,8 @@ elm_gengrid_item_insert_after(Evas_Object *obj,
item = _item_create(wd, gic, data, func, func_data);
if (!item) return NULL;
wd->items = eina_list_append_relative(wd->items, item, relative);
wd->items = eina_inlist_append_relative
(wd->items, EINA_INLIST_GET(item), EINA_INLIST_GET(relative));
if (wd->calc_job) ecore_job_del(wd->calc_job);
wd->calc_job = ecore_job_add(_calc_job, wd);
@ -1698,31 +1679,43 @@ elm_gengrid_clear(Evas_Object *obj)
if (wd->calc_job)
{
ecore_job_del(wd->calc_job);
wd->calc_job = NULL;
ecore_job_del(wd->calc_job);
wd->calc_job = NULL;
}
EINA_LIST_FOREACH_SAFE(wd->items, l, l_next, item)
if (wd->walking > 0)
{
wd->items = eina_list_remove_list(wd->items, l);
Elm_Gengrid_Item *it;
wd->clear_me = 1;
EINA_INLIST_FOREACH(wd->items, it)
it->delete_me = 1;
return;
}
wd->clear_me = 0;
while (wd->items)
{
Elm_Gengrid_Item *it = ELM_GENGRID_ITEM_FROM_INLIST(wd->items);
wd->items = eina_inlist_remove(wd->items, wd->items);
elm_widget_item_pre_notify_del(item);
if (item->realized) _item_unrealize(item);
if (item->gic->func.del)
if (item->realized) _item_unrealize(item);
if (item->gic->func.del)
item->gic->func.del((void *)item->base.data, wd->self);
if (item->long_timer) ecore_timer_del(item->long_timer);
if (item->long_timer) ecore_timer_del(item->long_timer);
elm_widget_item_del(item);
}
if (wd->selected)
{
eina_list_free(wd->selected);
wd->selected = NULL;
eina_list_free(wd->selected);
wd->selected = NULL;
}
wd->pan_x = 0;
wd->pan_y = 0;
wd->minw = 0;
wd->minh = 0;
wd->count = 0;
evas_object_size_hint_min_set(wd->pan_smart, wd->minw, wd->minh);
evas_object_smart_callback_call(wd->pan_smart, "changed", NULL);
}
@ -1793,6 +1786,26 @@ elm_gengrid_item_data_get(const Elm_Gengrid_Item *item)
return elm_widget_item_data_get(item);
}
/**
* Set the data item from the gengrid item
*
* This set the data value passed on the elm_gengrid_item_append() and
* related item addition calls. This function will also call
* elm_gengrid_item_update() so the item will be updated to reflect the
* new data.
*
* @param it The item
* @param data The new data pointer to set
*
* @ingroup Gengrid
*/
EAPI void
elm_gengrid_item_data_set(Elm_Gengrid_Item *it, const void *data)
{
elm_widget_item_data_set(it, data);
elm_gengrid_item_update(it);
}
/**
* Get the item's coordinates.
*
@ -2430,17 +2443,111 @@ elm_gengrid_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_
elm_smart_scroller_paging_set(wd->scr, pagerel_h, pagerel_v, h_pagesize, v_pagesize);
}
EAPI const Eina_List *
elm_gengrid_items_get(const Evas_Object *obj)
/**
* Get the first item in the gengrid
*
* This returns the first item in the list.
*
* @param obj The gengrid object
* @return The first item, or NULL if none
*
* @ingroup Gengrid
*/
EAPI Elm_Gengrid_Item *
elm_gengrid_first_item_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
return wd->items;
if (!wd->items) return NULL;
Elm_Gengrid_Item *it = ELM_GENGRID_ITEM_FROM_INLIST(wd->items);
while ((it) && (it->delete_me))
it = ELM_GENGRID_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
return it;
}
/**
* Get the last item in the gengrid
*
* This returns the last item in the list.
*
* @return The last item, or NULL if none
*
* @ingroup Gengrid
*/
EAPI Elm_Gengrid_Item *
elm_gengrid_last_item_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd->items) return NULL;
Elm_Gengrid_Item *it = ELM_GENGRID_ITEM_FROM_INLIST(wd->items->last);
if (!wd) return NULL;
while ((it) && (it->delete_me))
it = ELM_GENGRID_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
return it;
}
/**
* Get the next item in the gengrid
*
* This returns the item after the item @p it.
*
* @param it The item
* @return The item after @p it, or NULL if none
*
* @ingroup Gengrid
*/
EAPI Elm_Gengrid_Item *
elm_gengrid_item_next_get(const Elm_Gengrid_Item *it)
{
while (it)
{
it = ELM_GENGRID_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
if ((it) && (!it->delete_me)) break;
}
return (Elm_Gengrid_Item *)it;
}
/**
* Get the previous item in the gengrid
*
* This returns the item before the item @p it.
*
* @param it The item
* @return The item before @p it, or NULL if none
*
* @ingroup Gengrid
*/
EAPI Elm_Gengrid_Item *
elm_gengrid_item_prev_get(const Elm_Gengrid_Item *it)
{
while (it)
{
it = ELM_GENGRID_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
if ((it) && (!it->delete_me)) break;
}
return (Elm_Gengrid_Item *)it;
}
/**
* Get the gengrid object from an item
*
* This returns the gengrid object itself that an item belongs to.
*
* @param it The item
* @return The gengrid object
*
* @ingroup Gengrid
*/
EAPI Evas_Object *
elm_gengrid_item_gengrid_get(const Elm_Gengrid_Item *it)
{
if (!it) return NULL;
return it->base.widget;
}
/**
* Show the given item
*

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

@ -525,9 +525,8 @@ _item_single_select_up(Widget_Data *wd)
Elm_Genlist_Item *prev = elm_genlist_item_prev_get(wd->last_selected_item);
if (!prev) return EINA_FALSE;
while(wd->selected)
elm_genlist_item_selected_set(eina_list_data_get(wd->selected),
EINA_FALSE);
while (wd->selected)
elm_genlist_item_selected_set(wd->selected->data, EINA_FALSE);
elm_genlist_item_selected_set(prev, EINA_TRUE);
elm_genlist_item_show(prev);
@ -541,9 +540,8 @@ _item_single_select_down(Widget_Data *wd)
Elm_Genlist_Item *next = elm_genlist_item_next_get(wd->last_selected_item);
if (!next) return EINA_FALSE;
while(wd->selected)
elm_genlist_item_selected_set(eina_list_data_get(wd->selected),
EINA_FALSE);
while (wd->selected)
elm_genlist_item_selected_set(wd->selected, EINA_FALSE);
elm_genlist_item_selected_set(next, EINA_TRUE);
elm_genlist_item_show(next);