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

elementary/genlist - killed elm_genlist_item_sorted_insert. 

renamed elm_genlist_item_direct_sorted_insert to elm_genlist_item_sorted_insert



SVN revision: 68496
This commit is contained in:
ChunEon Park 2012-02-28 07:17:00 +00:00
parent 243786dc54
commit c2a70894ad
5 changed files with 26 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
legacy/elementary/src/bin/test_eio.c
View File

@ -37,6 +37,15 @@ _ls_filter_cb(void *data __UNUSED__, Eio_File *handler __UNUSED__, const char *f
return EINA_TRUE; return EINA_TRUE;
} }
static int
_compare_cb(const void *data1, const void *data2)
{
Elm_Object_Item *it = (Elm_Object_Item *)data1;
Elm_Object_Item *it2 = (Elm_Object_Item *)data2;
return strcoll(elm_object_item_data_get(it),
elm_object_item_data_get(it2));
}
static void static void
_ls_main_cb(void *data, Eio_File *handler __UNUSED__, const char *file) _ls_main_cb(void *data, Eio_File *handler __UNUSED__, const char *file)
{ {
@ -45,7 +54,7 @@ _ls_main_cb(void *data, Eio_File *handler __UNUSED__, const char *file)
eina_stringshare_add(file), eina_stringshare_add(file),
NULL, NULL,
ELM_GENLIST_ITEM_NONE, ELM_GENLIST_ITEM_NONE,
(Eina_Compare_Cb) strcoll, _compare_cb,
_sel_file, _sel_file,
NULL); NULL);
} }

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

@ -2060,7 +2060,7 @@ test_genlist13(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
pi[i] = elm_genlist_item_direct_sorted_insert pi[i] = elm_genlist_item_sorted_insert
(gl, &itc4, (void *)(long)idx[i]/* item data */, NULL/* parent */, (gl, &itc4, (void *)(long)idx[i]/* item data */, NULL/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl13_cmp/* cmp */, ELM_GENLIST_ITEM_SUBITEMS, gl13_cmp/* cmp */,
NULL/* func */, NULL/* func data */); NULL/* func */, NULL/* func data */);
@ -2071,7 +2071,7 @@ test_genlist13(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
int j; int j;
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
{ {
elm_genlist_item_direct_sorted_insert elm_genlist_item_sorted_insert
(gl, &itc4, (void *)(long)(idx[j] + base)/* item data */, (gl, &itc4, (void *)(long)(idx[j] + base)/* item data */,
pi[i]/* parent */, ELM_GENLIST_ITEM_NONE, pi[i]/* parent */, ELM_GENLIST_ITEM_NONE,
gl13_cmp/* cmp */, NULL/* func */, NULL/* func data */); gl13_cmp/* cmp */, NULL/* func */, NULL/* func data */);
@ -2080,7 +2080,7 @@ test_genlist13(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
pi[i + 3] = elm_genlist_item_direct_sorted_insert pi[i + 3] = elm_genlist_item_sorted_insert
(gl, &itc4, (void *)(long)(idx[i] * 2)/* item data */, NULL/* parent */, (gl, &itc4, (void *)(long)(idx[i] * 2)/* item data */, NULL/* parent */,
ELM_GENLIST_ITEM_SUBITEMS, gl13_cmp/* cmp */, NULL/* func */, ELM_GENLIST_ITEM_SUBITEMS, gl13_cmp/* cmp */, NULL/* func */,
NULL/* func data */); NULL/* func data */);
@ -2092,7 +2092,7 @@ test_genlist13(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
int j; int j;
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
{ {
elm_genlist_item_direct_sorted_insert elm_genlist_item_sorted_insert
(gl, &itc4, (void *)(long)(idx[j] + base)/* item data */, (gl, &itc4, (void *)(long)(idx[j] + base)/* item data */,
pi[i + 3]/* parent */, ELM_GENLIST_ITEM_NONE, pi[i + 3]/* parent */, ELM_GENLIST_ITEM_NONE,
gl13_cmp/* cmp */, NULL/* func */, NULL/* func data */); gl13_cmp/* cmp */, NULL/* func */, NULL/* func data */);

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

@ -659,10 +659,10 @@ _main_cb(void *data, Eio_File *handler, const Eina_File_Direct_Info *info __UNUS
{ {
Eina_Bool is_dir = (eio_file_associate_find(handler, "type/list") == list_itc[ELM_DIRECTORY]); Eina_Bool is_dir = (eio_file_associate_find(handler, "type/list") == list_itc[ELM_DIRECTORY]);
elm_genlist_item_direct_sorted_insert(wr->wd->files_list, eio_file_associate_find(handler, "type/list"), elm_genlist_item_sorted_insert(wr->wd->files_list, eio_file_associate_find(handler, "type/list"),
eina_stringshare_ref(eio_file_associate_find(handler, "filename")), eina_stringshare_ref(eio_file_associate_find(handler, "filename")),
wr->parent, wr->wd->expand && is_dir ? ELM_GENLIST_ITEM_SUBITEMS : ELM_GENLIST_ITEM_NONE, wr->parent, wr->wd->expand && is_dir ? ELM_GENLIST_ITEM_SUBITEMS : ELM_GENLIST_ITEM_NONE,
_file_list_cmp, NULL, NULL); _file_list_cmp, NULL, NULL);
} }
else if (wr->wd->mode == ELM_FILESELECTOR_GRID) else if (wr->wd->mode == ELM_FILESELECTOR_GRID)
elm_gengrid_item_direct_sorted_insert(wr->wd->files_grid, eio_file_associate_find(handler, "type/grid"), elm_gengrid_item_direct_sorted_insert(wr->wd->files_grid, eio_file_associate_find(handler, "type/grid"),

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

@ -3979,15 +3979,6 @@ _item_queue(Widget_Data *wd,
wd->queue_idle_enterer = ecore_idle_enterer_add(_item_idle_enterer, wd); wd->queue_idle_enterer = ecore_idle_enterer_add(_item_idle_enterer, wd);
} }
static int
_elm_genlist_item_compare_data(const void *data, const void *data1)
{
const Elm_Gen_Item *it = data;
const Elm_Gen_Item *item1 = data1;
return it->wd->item_compare_data_cb(it->base.data, item1->base.data);
}
static int static int
_elm_genlist_item_compare(const void *data, const void *data1) _elm_genlist_item_compare(const void *data, const void *data1)
{ {
@ -4214,14 +4205,14 @@ elm_genlist_item_insert_before(Evas_Object *obj,
} }
EAPI Elm_Object_Item * EAPI Elm_Object_Item *
elm_genlist_item_direct_sorted_insert(Evas_Object *obj, elm_genlist_item_sorted_insert(Evas_Object *obj,
const Elm_Genlist_Item_Class *itc, const Elm_Genlist_Item_Class *itc,
const void *data, const void *data,
Elm_Object_Item *parent, Elm_Object_Item *parent,
Elm_Genlist_Item_Flags flags, Elm_Genlist_Item_Flags flags,
Eina_Compare_Cb comp, Eina_Compare_Cb comp,
Evas_Smart_Cb func, Evas_Smart_Cb func,
const void *func_data) const void *func_data)
{ {
ELM_CHECK_WIDTYPE(obj, widtype) NULL; ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
@ -4298,24 +4289,6 @@ elm_genlist_item_direct_sorted_insert(Evas_Object *obj,
return (Elm_Object_Item *) it; return (Elm_Object_Item *) it;
} }
EAPI Elm_Object_Item *
elm_genlist_item_sorted_insert(Evas_Object *obj,
const Elm_Genlist_Item_Class *itc,
const void *data,
Elm_Object_Item *parent,
Elm_Genlist_Item_Flags flags,
Eina_Compare_Cb comp,
Evas_Smart_Cb func,
const void *func_data)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
wd->item_compare_data_cb = comp;
return elm_genlist_item_direct_sorted_insert(obj, itc, data, parent, flags,
_elm_genlist_item_compare_data,
func, func_data);
}
static void static void
_elm_genlist_clear(Evas_Object *obj, Eina_Bool standby) _elm_genlist_clear(Evas_Object *obj, Eina_Bool standby)
{ {

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

@ -903,11 +903,7 @@ EAPI Elm_Object_Item *elm_genlist_item_insert_after(Evas_Object *obj
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
// XXX: deprecate elm_genlist_item_sorted_insert() and rename
// elm_genlist_item_direct_sorted_insert()
// XXX: direct_sorted?? how about deprecating elm_genlist_item_direct_sorted_insert insetead?
EAPI Elm_Object_Item *elm_genlist_item_sorted_insert(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item_Flags flags, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data); EAPI Elm_Object_Item *elm_genlist_item_sorted_insert(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item_Flags flags, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
EAPI Elm_Object_Item *elm_genlist_item_direct_sorted_insert(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item_Flags flags, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
/* operations to retrieve existing items */ /* operations to retrieve existing items */
/** /**