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

fix up some dynamic add/del and showing code. 

SVN revision: 39072
This commit is contained in:
Carsten Haitzler 2009-02-18 04:18:25 +00:00
parent 4aff7b184a
commit 0c40d9a0a8
3 changed files with 129 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2103,7 +2103,7 @@ my_bt_29(void *data, Evas_Object *obj, void *event_info)
evas_object_size_hint_weight_set(gl, 1.0, 1.0);
evas_object_show(gl);
itc1.style = "default";
itc1.item_style = "default";
itc1.func.label_get = gl_label_get;
itc1.func.icon_get = gl_icon_get;
itc1.func.state_get = gl_state_get;
@ -2129,7 +2129,7 @@ my_gl_add(void *data, Evas_Object *obj, void *event_info)
Elm_Genlist_Item *gli;
static int i = 0;
itc1.style = "default";
itc1.item_style = "default";
itc1.func.label_get = gl_label_get;
itc1.func.icon_get = gl_icon_get;
itc1.func.state_get = gl_state_get;

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

@ -505,7 +505,7 @@ extern "C" {
typedef struct _Elm_Genlist_Item Elm_Genlist_Item;
struct _Elm_Genlist_Item_Class
{
const char *style;
const char *item_style;
struct {
char *(*label_get) (const void *data, Evas_Object *obj, const char *part);
Evas_Object *(*icon_get) (const void *data, Evas_Object *obj, const char *part);
@ -561,7 +561,7 @@ extern "C" {
//
//// (more widgets/features - medium priority)
// * genlist widget (complex list widget - harder to use than normal simple list, but handles huge lists of items etc.)
// * tree feature fir genlist widget (like biglist - but items can expand to sub-items)
// * tree feature for genlist widget (like biglist - but items can expand to sub-items)
// * radio + group handling
// * checkbox (like toggle)
// * pager (for pushing/popping pages and going back and forward and flipping)
@ -602,7 +602,7 @@ extern "C" {
// * prepend or append theme files from code for an app to allow an app to augment the theme eithe rby forcibly overriding things with its own theme file (so it can ship some custom elements that always override user theme) and so it can also provide a final (even after default) fallback for "extended" styles of its own (but thus allowing themes to overried its extensions if they want)
// * determine prefix of app dynamically and export calls to get prefix info
// * load config from file
// * load config from x prpoerty
// * load config from x property
// * handle finger size property and on-the-fly changes like scaling does
// * somehow a pdf(ps) viewer widget that doesnt make it gpl (lgpl)
// * emotion widget

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

@ -294,9 +294,9 @@ _item_realize(Item *it, int in, int calc)
evas_object_smart_member_add(it->base, it->wd->pan_smart);
elm_widget_sub_object_add(it->wd->obj, it->base);
if (in & 0x1)
snprintf(buf, sizeof(buf), "%s/%s", "item_odd", it->itc->style);
snprintf(buf, sizeof(buf), "%s/%s", "item_odd", it->itc->item_style);
else
snprintf(buf, sizeof(buf), "%s/%s", "item", it->itc->style);
snprintf(buf, sizeof(buf), "%s/%s", "item", it->itc->item_style);
_elm_theme_set(it->base, "genlist", buf, "default");
if (!calc)
{
@ -369,8 +369,8 @@ _item_realize(Item *it, int in, int calc)
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
edje_object_size_min_restricted_calc(it->base, &mw, &mh, mw, mh);
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
it->minw = mw;
it->minh = mh;
it->w = it->minw = mw;
it->h = it->minh = mh;
it->mincalcd = 1;
}
if (!calc) evas_object_show(it->base);
@ -403,6 +403,7 @@ _item_block_recalc(Item_Block *itb, int in)
Eina_List *l;
Evas_Coord minw = 0, minh = 0;
int showme = 0;
Evas_Coord y = 0;
for (l = itb->items; l; l = l->next)
{
@ -418,6 +419,9 @@ _item_block_recalc(Item_Block *itb, int in)
minh += it->minh;
if (minw < it->minw) minw = it->minw;
in++;
it->x = 0;
it->y = y;
y += it->minw;
}
itb->minw = minw;
itb->minh = minh;
@ -469,15 +473,16 @@ _item_block_position(Item_Block *itb)
it->x = 0;
it->y = y;
it->w = itb->w;
it->h = it->minh;
evas_object_resize(it->base, it->w, it->h);
evas_object_move(it->base,
ox + itb->x + it->x - itb->wd->pan_x,
oy + itb->y + it->y - itb->wd->pan_y);
evas_object_show(it->base);
if (it->realized)
{
evas_object_resize(it->base, it->w, it->h);
evas_object_move(it->base,
ox + itb->x + it->x - itb->wd->pan_x,
oy + itb->y + it->y - itb->wd->pan_y);
evas_object_show(it->base);
}
y += it->h;
}
itb->realized = 1;
}
static void
@ -485,28 +490,66 @@ _calc_job(void *data)
{
Widget_Data *wd = data;
Eina_Inlist *il;
Evas_Coord minw = 0, minh = 0, x = 0, y = 0, ow, oh;
Evas_Coord minw = -1, minh = 0, x = 0, y = 0, ow, oh;
Item_Block *chb = NULL;
int bn, in;
int minw_change = 0;
for (bn = 0, in = 0, il = wd->blocks; il; il = il->next, bn++)
{
Item_Block *itb = (Item_Block *)il;
int showme;
if (itb->changed) showme = _item_block_recalc(itb, in);
int showme = 0;
if (chb)
{
if (itb->realized) _item_block_unrealize(itb);
}
if (itb->changed)
{
if (itb->realized) _item_block_unrealize(itb);
showme = _item_block_recalc(itb, in);
printf("change block %i\n", bn);
chb = itb;
}
itb->y = y;
itb->x = 0;
itb->w = itb->minw;
itb->h = itb->minh;
minh += itb->minh;
if (minw < itb->minw) minw = itb->minw;
if (minw == -1) minw = itb->minw;
else if (minw < itb->minw)
{
minw = itb->minw;
minw_change = 1;
}
itb->w = minw;
itb->h = itb->minh;
y += itb->minh;
y += itb->h;
in += itb->count;
if (showme)
{
wd->show_item->showme = 0;
elm_smart_scroller_child_region_show(wd->scr, wd->show_item->x, wd->show_item->y, wd->show_item->w, wd->show_item->h);
elm_smart_scroller_child_region_show(wd->scr,
wd->show_item->x + wd->show_item->block->x,
wd->show_item->y + wd->show_item->block->y,
wd->show_item->block->w,
wd->show_item->h);
wd->show_item = NULL;
showme = 0;
}
}
if (minw_change)
{
for (il = wd->blocks; il; il = il->next)
{
Item_Block *itb = (Item_Block *)il;
itb->minw = minw;
itb->w = itb->minw;
}
}
if ((chb) && (((Eina_Inlist *)(chb))->next))
{
for (il = ((Eina_Inlist *)(chb))->next; il; il = il->next)
{
Item_Block *itb = (Item_Block *)il;
if (itb->realized) _item_block_unrealize(itb);
}
}
evas_object_geometry_get(wd->pan_smart, NULL, NULL, &ow, &oh);
@ -717,20 +760,63 @@ static void
_item_block_del(Item *it)
{
Eina_Inlist *il;
Item_Block *itb = it->block;
it->block->items = eina_list_remove(it->block->items, it);
it->block->count--;
it->block->changed = 1;
itb->items = eina_list_remove(itb->items, it);
itb->count--;
itb->changed = 1;
if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
if (it->block->count < 1)
// for (il = (Eina_Inlist *)(itb); il; il = il->next)
// {
// Item_Block *itb2 = (Item_Block *)il;
// _item_block_unrealize(itb2);
// }
if (itb->count < 1)
{
// FIXME: free block
it->wd->blocks = eina_inlist_remove(it->wd->blocks, (Eina_Inlist *)itb);
free(itb);
}
for (il = (Eina_Inlist *)(it->block); il; il = il->next)
else
{
Item_Block *itb = (Item_Block *)il;
_item_block_unrealize(itb);
if (itb->count < 16)
{
Item_Block *itbp = (Item_Block *)(((Eina_Inlist *)(itb))->prev);
Item_Block *itbn = (Item_Block *)(((Eina_Inlist *)(itb))->next);
if ((itbp) && ((itbp->count + itb->count) < 48))
{
printf("merge with prev\n");
// merge prev + itb
while (itb->items)
{
Item *it2 = itb->items->data;
it2->block = itbp;
itbp->items = eina_list_append(itbp->items, it2);
itb->items = eina_list_remove_list(itb->items, itb->items);
itbp->count++;
itbp->changed = 1;
}
it->wd->blocks = eina_inlist_remove(it->wd->blocks, (Eina_Inlist *)itb);
free(itb);
}
else if ((itbn) && ((itbn->count + itb->count) < 48))
{
printf("merge with next\n");
// merge next + itb
while (itb->items)
{
Eina_List *last = eina_list_last(itb->items);
Item *it2 = last->data;
it2->block = itbn;
itb->items = eina_list_remove_list(itb->items, last);
itbn->items = eina_list_prepend(itbn->items, it2);
itbn->count++;
itbn->changed = 1;
}
it->wd->blocks = eina_inlist_remove(it->wd->blocks, (Eina_Inlist *)itb);
free(itb);
}
}
}
}
@ -878,6 +964,7 @@ elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc,
Elm_Genlist_Item_Flags flags,
void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data)
{
// fixme
}
EAPI Elm_Genlist_Item *
@ -886,6 +973,7 @@ elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *i
Elm_Genlist_Item_Flags flags,
void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data)
{
// fixme
}
EAPI Elm_Genlist_Item *
@ -894,6 +982,7 @@ elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *it
Elm_Genlist_Item_Flags flags,
void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data)
{
// fixme
}
EAPI void
@ -903,11 +992,6 @@ elm_genlist_multi_select_set(Evas_Object *obj, Evas_Bool multi)
wd->multi = multi;
}
EAPI const Eina_List *
elm_genlist_items_get(Evas_Object *obj)
{
}
EAPI const Elm_Genlist_Item *
elm_genlist_selected_item_get(Evas_Object *obj)
{
@ -1000,7 +1084,14 @@ elm_genlist_item_show(Elm_Genlist_Item *item)
it->wd->show_item->showme = 0;
it->wd->show_item = NULL;
}
elm_smart_scroller_child_region_show(it->wd->scr, it->x, it->y, it->w, it->h);
printf("%i %i | %ix%i\n",
it->x + it->block->x,
it->y + it->block->y,
it->block->w, it->h);
elm_smart_scroller_child_region_show(it->wd->scr,
it->x + it->block->x,
it->y + it->block->y,
it->block->w, it->h);
}
EAPI void