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

elementary: now elm_gen*_clear only destroy the item created before calling it. 

NOTE: As side fix, both genlist and gengrid now share their Widget_Data. Need
a lot more work to be clean and match our quality standard.

NOTE2: Genclear is now faster as it doesn't require to mark all item that need
to be removed, but just increase one int.



SVN revision: 65811
This commit is contained in:
Cedric BAIL 2011-12-02 13:43:02 +00:00
parent 2d90565a85
commit 926e801b59
5 changed files with 237 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/elementary/src/lib/elm_gen.c
View File

@ -3,7 +3,6 @@
#include "elm_priv.h"
#include "els_scroller.h"
#include "elm_gen.h"
#include "elm_genlist.h"
EAPI void
elm_gen_clear(Evas_Object *obj)

158
legacy/elementary/src/lib/elm_gen.h
View File

@ -1,3 +1,6 @@
#ifndef ELM_GEN_H_
# define ELM_GEN_H_
#include <Elementary.h>
#include <Elementary_Cursor.h>
#include "elm_priv.h"
@ -5,6 +8,8 @@
#define ELM_GEN_ITEM_FROM_INLIST(it) \
((it) ? EINA_INLIST_CONTAINER_GET(it, Elm_Gen_Item) : NULL)
#define SWIPE_MOVES 12
typedef struct Elm_Gen_Item_Type Elm_Gen_Item_Type;
typedef struct Elm_Gen_Item_Tooltip Elm_Gen_Item_Tooltip;
typedef struct _Widget_Data Widget_Data;
@ -32,6 +37,7 @@ struct Elm_Gen_Item
Ecore_Timer *long_timer;
int relcount;
int walking;
int generation;
const char *mouse_cursor;
struct
@ -51,9 +57,159 @@ struct Elm_Gen_Item
Eina_Bool highlighted : 1;
Eina_Bool disabled : 1;
Eina_Bool dragging : 1;
Eina_Bool delete_me : 1;
Eina_Bool down : 1;
Eina_Bool group : 1;
Eina_Bool reorder : 1;
Eina_Bool mode_set : 1; /* item uses style mode for highlight/select */
};
typedef struct _Pan Pan;
struct _Pan
{
Evas_Object_Smart_Clipped_Data __clipped_data;
Widget_Data *wd;
Ecore_Job *resize_job;
};
struct _Widget_Data
{
Eina_Inlist_Sorted_State *state;
Evas_Object *obj; /* the genlist object */
Evas_Object *scr; /* a smart scroller object which is used internally in genlist */
Evas_Object *pan_smart; /* "elm_genlist_pan" evas smart object. this is an extern pan of smart scroller(scr). */
Eina_List *selected;
Eina_List *group_items; /* list of groups index items */
Eina_Inlist *items; /* inlist of all items */
Elm_Gen_Item *reorder_it; /* item currently being repositioned */
Elm_Gen_Item *last_selected_item;
Pan *pan; /* pan_smart object's smart data */
Ecore_Job *calc_job;
int walking;
int item_width, item_height;
int group_item_width, group_item_height;
int minw, minh;
long count;
Evas_Coord pan_x, pan_y;
Eina_Bool reorder_mode : 1; /* a flag for reorder mode enable/disable */
Eina_Bool on_hold : 1;
Eina_Bool multi : 1; /* a flag for item multi selection */
Eina_Bool no_select : 1;
Eina_Bool wasselected : 1;
Eina_Bool always_select : 1;
Eina_Bool clear_me : 1;
Eina_Bool h_bounce : 1;
Eina_Bool v_bounce : 1;
Ecore_Cb del_cb, calc_cb, sizing_cb;
Ecore_Cb clear_cb;
////////////////////////////////////
Eina_Inlist *blocks; /* inlist of all blocks. a block consists of a certain number of items. maximum number of items in a block is 'max_items_per_block'. */
Evas_Coord reorder_old_pan_y, w, h, realminw, prev_viewport_w;
Ecore_Job *update_job;
Ecore_Idle_Enterer *queue_idle_enterer;
Ecore_Idler *must_recalc_idler;
Eina_List *queue;
Elm_Gen_Item *show_item, *anchor_item, *mode_item, *reorder_rel, *expanded_item;
Eina_Inlist *item_cache; /* an inlist of edje object it cache. */
Evas_Coord anchor_y;
Evas_Coord reorder_start_y; /* reorder it's initial y coordinate in the pan. */
Elm_List_Mode mode;
Ecore_Timer *multi_timer, *scr_hold_timer;
Ecore_Animator *reorder_move_animator;
const char *mode_type;
const char *mode_item_style;
unsigned int start_time;
Evas_Coord prev_x, prev_y, prev_mx, prev_my;
Evas_Coord cur_x, cur_y, cur_mx, cur_my;
Eina_Bool mouse_down : 1;
Eina_Bool multi_down : 1;
Eina_Bool multi_timeout : 1;
Eina_Bool multitouched : 1;
Eina_Bool longpressed : 1;
Eina_Bool bring_in : 1;
Eina_Bool compress : 1;
Eina_Bool height_for_width : 1;
Eina_Bool homogeneous : 1;
Eina_Bool swipe : 1;
Eina_Bool reorder_pan_move : 1;
Eina_Bool auto_scroll_enabled : 1;
Eina_Bool pan_resized : 1;
struct
{
Evas_Coord x, y;
} history[SWIPE_MOVES];
int multi_device;
int item_cache_count;
int item_cache_max; /* maximum number of cached items */
int movements;
int max_items_per_block; /* maximum number of items per block */
double longpress_timeout; /* longpress timeout. this value comes from _elm_config by default. this can be changed by elm_genlist_longpress_timeout_set() */
int generation;
/* The stuff below directly come from gengrid without any thinking */
unsigned int nmax;
Evas_Coord reorder_item_x, reorder_item_y;
Evas_Coord old_pan_x, old_pan_y;
long items_lost;
double align_x, align_y;
Eina_Bool horizontal : 1;
Eina_Bool move_effect_enabled : 1;
Eina_Bool reorder_item_changed : 1;
};
Elm_Gen_Item *
_elm_genlist_item_new(Widget_Data *wd,
const Elm_Gen_Item_Class *itc,
const void *data,
Elm_Gen_Item *parent,
Evas_Smart_Cb func,
const void *func_data);
Evas_Object *
_elm_genlist_item_widget_get(const Elm_Gen_Item *it);
void
_elm_genlist_page_relative_set(Evas_Object *obj,
double h_pagerel,
double v_pagerel);
void
_elm_genlist_page_relative_get(const Evas_Object *obj,
double *h_pagerel,
double *v_pagerel);
void
_elm_genlist_page_size_set(Evas_Object *obj,
Evas_Coord h_pagesize,
Evas_Coord v_pagesize);
void
_elm_genlist_current_page_get(const Evas_Object *obj,
int *h_pagenumber,
int *v_pagenumber);
void
_elm_genlist_last_page_get(const Evas_Object *obj,
int *h_pagenumber,
int *v_pagenumber);
void
_elm_genlist_page_show(const Evas_Object *obj,
int h_pagenumber,
int v_pagenumber);
void
_elm_genlist_page_bring_in(const Evas_Object *obj,
int h_pagenumber,
int v_pagenumber);
void
_elm_genlist_item_unrealize(Elm_Gen_Item *it,
Eina_Bool calc);
void
_elm_genlist_item_del_serious(Elm_Gen_Item *it);
void
_elm_genlist_item_del_notserious(Elm_Gen_Item *it);
#endif

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

@ -3,7 +3,6 @@
#include "elm_priv.h"
#include "els_scroller.h"
#include "elm_gen.h"
#include "elm_genlist.h"
/* --
* TODO:
@ -34,6 +33,7 @@ struct Elm_Gen_Item_Type
Eina_Bool moving : 1;
};
#if 0
struct _Widget_Data
{
Eina_Inlist_Sorted_State *state;
@ -72,11 +72,14 @@ struct _Widget_Data
unsigned int nmax;
long items_lost;
int generation;
Eina_Bool horizontal : 1;
Eina_Bool longpressed : 1;
Eina_Bool reorder_item_changed : 1;
Eina_Bool move_effect_enabled : 1;
};
#endif
static const char *widtype = NULL;
static void _item_highlight(Elm_Gen_Item *it);
@ -431,7 +434,7 @@ _item_single_select_up(Widget_Data *wd)
if (!wd->selected)
{
prev = ELM_GEN_ITEM_FROM_INLIST(wd->items->last);
while ((prev) && (prev->delete_me))
while ((prev) && (prev->generation < wd->generation))
prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev);
elm_gengrid_item_selected_set(prev, EINA_TRUE);
elm_gengrid_item_show(prev);
@ -465,7 +468,7 @@ _item_single_select_down(Widget_Data *wd)
if (!wd->selected)
{
next = ELM_GEN_ITEM_FROM_INLIST(wd->items);
while ((next) && (next->delete_me))
while ((next) && (next->generation < wd->generation))
next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
elm_gengrid_item_selected_set(next, EINA_TRUE);
elm_gengrid_item_show(next);
@ -496,7 +499,7 @@ _item_single_select_left(Widget_Data *wd)
if (!wd->selected)
{
prev = ELM_GEN_ITEM_FROM_INLIST(wd->items->last);
while ((prev) && (prev->delete_me))
while ((prev) && (prev->generation < wd->generation))
prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev);
}
else prev = elm_gengrid_item_prev_get(wd->last_selected_item);
@ -517,7 +520,7 @@ _item_single_select_right(Widget_Data *wd)
if (!wd->selected)
{
next = ELM_GEN_ITEM_FROM_INLIST(wd->items);
while ((next) && (next->delete_me))
while ((next) && (next->generation < wd->generation))
next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
}
else next = elm_gengrid_item_next_get(wd->last_selected_item);
@ -901,7 +904,7 @@ _mouse_up(void *data,
static void
_item_highlight(Elm_Gen_Item *it)
{
if ((it->wd->no_select) || (it->delete_me) || (it->highlighted)) return;
if ((it->wd->no_select) || (it->generation < it->wd->generation) || (it->highlighted)) return;
edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
it->highlighted = EINA_TRUE;
}
@ -912,7 +915,7 @@ _item_realize(Elm_Gen_Item *it)
char buf[1024];
char style[1024];
if ((it->realized) || (it->delete_me)) return;
if ((it->realized) || (it->generation < it->wd->generation)) return;
VIEW(it) = edje_object_add(evas_object_evas_get(WIDGET(it)));
edje_object_scale_set(VIEW(it), elm_widget_scale_get(WIDGET(it)) *
_elm_config->scale);
@ -1434,7 +1437,7 @@ _item_del(Elm_Gen_Item *it)
static void
_item_unselect(Elm_Gen_Item *it)
{
if ((it->delete_me) || (!it->highlighted)) return;
if ((it->generation < it->wd->generation) || (!it->highlighted)) return;
edje_object_signal_emit(VIEW(it), "elm,state,unselected", "elm");
it->highlighted = EINA_FALSE;
if (it->selected)
@ -1893,6 +1896,7 @@ elm_gengrid_add(Evas_Object *parent)
elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook);
elm_widget_event_hook_set(obj, _event_hook);
wd->generation = 1;
wd->scr = elm_smart_scroller_add(e);
elm_smart_scroller_widget_set(wd->scr, obj);
elm_smart_scroller_object_theme_set(obj, wd->scr, "gengrid", "base",
@ -2252,7 +2256,7 @@ EAPI const Elm_Gengrid_Item_Class *
elm_gengrid_item_item_class_get(const Elm_Gen_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
if (it->delete_me) return NULL;
if (it->generation < it->wd->generation) return NULL;
return it->itc;
}
@ -2262,7 +2266,7 @@ elm_gengrid_item_item_class_set(Elm_Gen_Item *it,
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
EINA_SAFETY_ON_NULL_RETURN(itc);
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
it->itc = itc;
elm_gengrid_item_update(it);
}
@ -2334,7 +2338,7 @@ elm_gengrid_item_disabled_set(Elm_Gen_Item *it,
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
if (it->disabled == disabled) return;
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
it->disabled = !!disabled;
if (it->realized)
{
@ -2349,7 +2353,7 @@ EAPI Eina_Bool
elm_gengrid_item_disabled_get(const Elm_Gen_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
if (it->delete_me) return EINA_FALSE;
if (it->generation < it->wd->generation) return EINA_FALSE;
return it->disabled;
}
@ -2672,7 +2676,7 @@ elm_gengrid_item_show(Elm_Gen_Item *it)
Evas_Coord minx = 0, miny = 0;
if (!wd) return;
if ((!it) || (it->delete_me)) return;
if ((!it) || (it->generation < it->wd->generation)) return;
_pan_min_get(wd->pan_smart, &minx, &miny);
if (wd->horizontal)
@ -2693,7 +2697,7 @@ EAPI void
elm_gengrid_item_bring_in(Elm_Gen_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
Evas_Coord minx = 0, miny = 0;
Widget_Data *wd = it->wd;

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

@ -5,9 +5,7 @@
#include "elm_priv.h"
#include "els_scroller.h"
#include "elm_gen.h"
#include "elm_genlist.h"
#define SWIPE_MOVES 12
#define MAX_ITEMS_PER_BLOCK 32
#define REORDER_EFFECT_TIME 0.5
@ -57,80 +55,6 @@ struct Elm_Gen_Item_Type
Eina_Bool move_effect_enabled : 1;
};
struct _Widget_Data
{
Eina_Inlist_Sorted_State *state;
Evas_Object *obj; /* the genlist object */
Evas_Object *scr; /* a smart scroller object which is used internally in genlist */
Evas_Object *pan_smart; /* "elm_genlist_pan" evas smart object. this is an extern pan of smart scroller(scr). */
Eina_List *selected;
Eina_List *group_items; /* list of groups index items */
Eina_Inlist *items; /* inlist of all items */
Elm_Gen_Item *reorder_it; /* item currently being repositioned */
Elm_Gen_Item *last_selected_item;
Pan *pan; /* pan_smart object's smart data */
Ecore_Job *calc_job;
int walking;
int item_width, item_height;
int group_item_width, group_item_height;
int minw, minh;
long count;
Evas_Coord pan_x, pan_y;
Eina_Bool reorder_mode : 1; /* a flag for reorder mode enable/disable */
Eina_Bool on_hold : 1;
Eina_Bool multi : 1; /* a flag for item multi selection */
Eina_Bool no_select : 1;
Eina_Bool wasselected : 1;
Eina_Bool always_select : 1;
Eina_Bool clear_me : 1;
Eina_Bool h_bounce : 1;
Eina_Bool v_bounce : 1;
Ecore_Cb del_cb, calc_cb, sizing_cb;
Ecore_Cb clear_cb;
////////////////////////////////////
Eina_Inlist *blocks; /* inlist of all blocks. a block consists of a certain number of items. maximum number of items in a block is 'max_items_per_block'. */
Evas_Coord reorder_old_pan_y, w, h, realminw, prev_viewport_w;
Ecore_Job *update_job;
Ecore_Idle_Enterer *queue_idle_enterer;
Ecore_Idler *must_recalc_idler;
Eina_List *queue;
Elm_Gen_Item *show_item, *anchor_item, *mode_item, *reorder_rel, *expanded_item;
Eina_Inlist *item_cache; /* an inlist of edje object it cache. */
Evas_Coord anchor_y;
Evas_Coord reorder_start_y; /* reorder it's initial y coordinate in the pan. */
Elm_List_Mode mode;
Ecore_Timer *multi_timer, *scr_hold_timer;
Ecore_Animator *reorder_move_animator;
const char *mode_type;
const char *mode_item_style;
unsigned int start_time;
Evas_Coord prev_x, prev_y, prev_mx, prev_my;
Evas_Coord cur_x, cur_y, cur_mx, cur_my;
Eina_Bool mouse_down : 1;
Eina_Bool multi_down : 1;
Eina_Bool multi_timeout : 1;
Eina_Bool multitouched : 1;
Eina_Bool longpressed : 1;
Eina_Bool bring_in : 1;
Eina_Bool compress : 1;
Eina_Bool height_for_width : 1;
Eina_Bool homogeneous : 1;
Eina_Bool swipe : 1;
Eina_Bool reorder_pan_move : 1;
Eina_Bool auto_scroll_enabled : 1;
Eina_Bool pan_resized : 1;
struct
{
Evas_Coord x, y;
} history[SWIPE_MOVES];
int multi_device;
int item_cache_count;
int item_cache_max; /* maximum number of cached items */
int movements;
int max_items_per_block; /* maximum number of items per block */
double longpress_timeout; /* longpress timeout. this value comes from _elm_config by default. this can be changed by elm_genlist_longpress_timeout_set() */
};
struct _Item_Block
{
EINA_INLIST;
@ -210,6 +134,7 @@ static void _item_move_after(Elm_Gen_Item *it,
static void _item_move_before(Elm_Gen_Item *it,
Elm_Gen_Item *before);
static void _item_auto_scroll(Widget_Data *wd);
static void _elm_genlist_clear(Evas_Object *obj, Eina_Bool standby);
static Evas_Smart_Class _pan_sc = EVAS_SMART_CLASS_INIT_VERSION;
@ -508,7 +433,7 @@ _item_single_select_up(Widget_Data *wd)
if (!wd->selected)
{
prev = ELM_GEN_ITEM_FROM_INLIST(wd->items->last);
while ((prev) && (prev->delete_me))
while ((prev) && (prev->generation < wd->generation))
prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev);
}
else prev = elm_genlist_item_prev_get(wd->last_selected_item);
@ -529,7 +454,7 @@ _item_single_select_down(Widget_Data *wd)
if (!wd->selected)
{
next = ELM_GEN_ITEM_FROM_INLIST(wd->items);
while ((next) && (next->delete_me))
while ((next) && (next->generation < wd->generation))
next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
}
else next = elm_genlist_item_next_get(wd->last_selected_item);
@ -717,7 +642,7 @@ static void
_item_highlight(Elm_Gen_Item *it)
{
const char *selectraise;
if ((it->wd->no_select) || (it->delete_me) || (it->highlighted) ||
if ((it->wd->no_select) || (it->generation < it->wd->generation) || (it->highlighted) ||
(it->disabled) || (it->display_only) || (it->item->mode_view))
return;
edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
@ -734,7 +659,7 @@ _item_highlight(Elm_Gen_Item *it)
static void
_item_unhighlight(Elm_Gen_Item *it)
{
if ((it->delete_me) || (!it->highlighted)) return;
if ((it->generation < it->wd->generation) || (!it->highlighted)) return;
edje_object_signal_emit(VIEW(it), "elm,state,unselected", "elm");
if (!it->item->nostacking)
{
@ -870,7 +795,7 @@ _clear_cb(Widget_Data *wd)
static void
_item_unselect(Elm_Gen_Item *it)
{
if ((it->delete_me) || (!it->selected)) return;
if ((it->generation < it->wd->generation) || (!it->selected)) return;
it->selected = EINA_FALSE;
it->wd->selected = eina_list_remove(it->wd->selected, it);
evas_object_smart_callback_call(WIDGET(it), SIG_UNSELECTED, it);
@ -1477,7 +1402,7 @@ _mode_finished_signal_cb(void *data,
if (!data) return;
if (!obj) return;
Elm_Gen_Item *it = data;
if ((it->delete_me) || (!it->realized) || (!it->item->mode_view)) return;
if ((it->generation < it->wd->generation) || (!it->realized) || (!it->item->mode_view)) return;
char buf[1024];
Evas *te = evas_object_evas_get(obj);
@ -1841,7 +1766,7 @@ _item_realize(Elm_Gen_Item *it,
int depth, tsize = 20;
Item_Cache *itc = NULL;
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
//evas_event_freeze(evas_object_evas_get(it->wd->obj));
if (it->realized)
{
@ -2068,7 +1993,7 @@ _item_block_recalc(Item_Block *itb,
itb->num = in;
EINA_LIST_FOREACH(itb->items, l, it)
{
if (it->delete_me) continue;
if (it->generation < it->wd->generation) continue;
showme |= it->item->showme;
if (!itb->realized)
{
@ -2259,7 +2184,7 @@ _item_block_position(Item_Block *itb,
&cvw, &cvh);
EINA_LIST_FOREACH(itb->items, l, it)
{
if (it->delete_me) continue;
if (it->generation < it->wd->generation) continue;
else if (it->wd->reorder_it == it) continue;
it->x = 0;
it->y = y;
@ -2906,7 +2831,7 @@ _mode_item_realize(Elm_Gen_Item *it)
{
char buf[1024];
if ((it->item->mode_view) || (it->delete_me)) return;
if ((it->item->mode_view) || (it->generation < it->wd->generation)) return;
evas_event_freeze(evas_object_evas_get(it->wd->obj));
it->item->mode_view = edje_object_add(evas_object_evas_get(WIDGET(it)));
@ -3098,6 +3023,7 @@ elm_genlist_add(Evas_Object *parent)
elm_widget_on_show_region_hook_set(obj, _show_region_hook, obj);
elm_widget_translate_hook_set(obj, _translate_hook);
wd->generation = 1;
wd->scr = elm_smart_scroller_add(e);
elm_smart_scroller_widget_set(wd->scr, obj);
elm_smart_scroller_object_theme_set(obj, wd->scr, "genlist", "base",
@ -3148,7 +3074,7 @@ elm_genlist_add(Evas_Object *parent)
void
_item_select(Elm_Gen_Item *it)
{
if ((it->wd->no_select) || (it->delete_me) || (it->mode_set)) return;
if ((it->wd->no_select) || (it->generation < it->wd->generation) || (it->mode_set)) return;
if (!it->selected)
{
it->selected = EINA_TRUE;
@ -3160,16 +3086,16 @@ _item_select(Elm_Gen_Item *it)
it->walking++;
it->wd->walking++;
if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), it);
if (!it->delete_me)
if (it->generation == it->wd->generation)
evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, it);
it->walking--;
it->wd->walking--;
evas_object_unref(WIDGET(it));
if ((it->wd->clear_me) && (!it->wd->walking))
elm_genlist_clear(WIDGET(it));
_elm_genlist_clear(WIDGET(it), EINA_TRUE);
else
{
if ((!it->walking) && (it->delete_me))
if ((!it->walking) && (it->generation < it->wd->generation))
{
if (!it->relcount) it->del_cb(it);
}
@ -3221,6 +3147,7 @@ _elm_genlist_item_new(Widget_Data *wd,
it = elm_widget_item_new(wd->obj, Elm_Gen_Item);
if (!it) return NULL;
it->wd = wd;
it->generation = wd->generation;
it->itc = itc;
it->base.data = data;
it->parent = parent;
@ -3376,7 +3303,7 @@ newblock:
if (it->item->rel)
{
it->item->rel->relcount--;
if ((it->item->rel->delete_me) && (!it->item->rel->relcount))
if ((it->item->rel->generation < it->wd->generation) && (!it->item->rel->relcount))
_item_del(it->item->rel);
it->item->rel = NULL;
}
@ -3831,13 +3758,17 @@ elm_genlist_item_sorted_insert(Evas_Object *obj,
_elm_genlist_item_compare_data, func, func_data);
}
EAPI void
elm_genlist_clear(Evas_Object *obj)
static void
_elm_genlist_clear(Evas_Object *obj, Eina_Bool standby)
{
Eina_Inlist *next, *l;
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if (!standby) wd->generation++;
if (wd->state)
{
eina_inlist_sorted_state_free(wd->state);
@ -3846,17 +3777,20 @@ elm_genlist_clear(Evas_Object *obj)
if (wd->walking > 0)
{
Elm_Gen_Item *it;
wd->clear_me = 1;
EINA_INLIST_FOREACH(wd->items, it)
it->delete_me = 1;
return;
}
evas_event_freeze(evas_object_evas_get(wd->obj));
while (wd->items)
for (l = wd->items, next = l ? l->next : NULL;
l;
l = next, next = next ? next->next : NULL)
{
Elm_Gen_Item *it = ELM_GEN_ITEM_FROM_INLIST(wd->items);
it->del_cb(it);
Elm_Gen_Item *it = ELM_GEN_ITEM_FROM_INLIST(l);
if (it->generation < wd->generation)
{
it->del_cb(it);
}
}
wd->clear_me = 0;
if (wd->calc_job)
@ -3882,6 +3816,12 @@ elm_genlist_clear(Evas_Object *obj)
evas_event_thaw_eval(evas_object_evas_get(wd->obj));
}
EAPI void
elm_genlist_clear(Evas_Object *obj)
{
_elm_genlist_clear(obj, EINA_FALSE);
}
EAPI void
elm_genlist_multi_select_set(Evas_Object *obj,
Eina_Bool multi)
@ -4009,7 +3949,7 @@ elm_genlist_first_item_get(const Evas_Object *obj)
if (!wd) return NULL;
if (!wd->items) return NULL;
Elm_Gen_Item *it = ELM_GEN_ITEM_FROM_INLIST(wd->items);
while ((it) && (it->delete_me))
while ((it) && (it->generation < wd->generation))
it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
return it;
}
@ -4022,7 +3962,7 @@ elm_genlist_last_item_get(const Evas_Object *obj)
if (!wd) return NULL;
if (!wd->items) return NULL;
Elm_Gen_Item *it = ELM_GEN_ITEM_FROM_INLIST(wd->items->last);
while ((it) && (it->delete_me))
while ((it) && (it->generation < wd->generation))
it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
return it;
}
@ -4034,7 +3974,7 @@ elm_genlist_item_next_get(const Elm_Gen_Item *it)
while (it)
{
it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
if ((it) && (!it->delete_me)) break;
if ((it) && (it->generation == it->wd->generation)) break;
}
return (Elm_Gen_Item *)it;
}
@ -4046,7 +3986,7 @@ elm_genlist_item_prev_get(const Elm_Gen_Item *it)
while (it)
{
it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
if ((it) && (!it->delete_me)) break;
if ((it) && (it->generation == it->wd->generation)) break;
}
return (Elm_Gen_Item *)it;
}
@ -4084,7 +4024,7 @@ elm_genlist_item_selected_set(Elm_Gen_Item *it,
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
Widget_Data *wd = it->wd;
if (!wd) return;
if ((it->delete_me) || (it->disabled)) return;
if ((it->generation < wd->generation) || (it->disabled)) return;
selected = !!selected;
if (it->selected == selected) return;
@ -4159,7 +4099,7 @@ elm_genlist_item_disabled_set(Elm_Gen_Item *it,
Eina_List *l;
Evas_Object *obj;
if (it->disabled == disabled) return;
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
it->disabled = !!disabled;
if (it->selected)
elm_genlist_item_selected_set(it, EINA_FALSE);
@ -4178,7 +4118,7 @@ EAPI Eina_Bool
elm_genlist_item_disabled_get(const Elm_Gen_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
if (it->delete_me) return EINA_FALSE;
if (it->generation < it->wd->generation) return EINA_FALSE;
return it->disabled;
}
@ -4188,7 +4128,7 @@ elm_genlist_item_display_only_set(Elm_Gen_Item *it,
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
if (it->display_only == display_only) return;
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
it->display_only = display_only;
it->item->mincalcd = EINA_FALSE;
it->item->updateme = EINA_TRUE;
@ -4201,7 +4141,7 @@ EAPI Eina_Bool
elm_genlist_item_display_only_get(const Elm_Gen_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
if (it->delete_me) return EINA_FALSE;
if (it->generation < it->wd->generation) return EINA_FALSE;
return it->display_only;
}
@ -4210,7 +4150,7 @@ elm_genlist_item_show(Elm_Gen_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
Evas_Coord gith = 0;
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
if ((it->item->queued) || (!it->item->mincalcd))
{
it->wd->show_item = it;
@ -4235,7 +4175,7 @@ EAPI void
elm_genlist_item_promote(Elm_Gen_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
_item_move_before(it, elm_genlist_first_item_get(WIDGET(it)));
}
@ -4243,7 +4183,7 @@ EAPI void
elm_genlist_item_demote(Elm_Gen_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
_item_move_after(it, elm_genlist_last_item_get(WIDGET(it)));
}
@ -4252,7 +4192,7 @@ elm_genlist_item_bring_in(Elm_Gen_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
Evas_Coord gith = 0;
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
if ((it->item->queued) || (!it->item->mincalcd))
{
it->wd->show_item = it;
@ -4280,7 +4220,7 @@ elm_genlist_item_top_show(Elm_Gen_Item *it)
Evas_Coord ow, oh;
Evas_Coord gith = 0;
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
if ((it->item->queued) || (!it->item->mincalcd))
{
it->wd->show_item = it;
@ -4308,7 +4248,7 @@ elm_genlist_item_top_bring_in(Elm_Gen_Item *it)
Evas_Coord ow, oh;
Evas_Coord gith = 0;
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
if ((it->item->queued) || (!it->item->mincalcd))
{
it->wd->show_item = it;
@ -4335,7 +4275,7 @@ elm_genlist_item_middle_show(Elm_Gen_Item *it)
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
Evas_Coord ow, oh;
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
if ((it->item->queued) || (!it->item->mincalcd))
{
it->wd->show_item = it;
@ -4361,7 +4301,7 @@ elm_genlist_item_middle_bring_in(Elm_Gen_Item *it)
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
Evas_Coord ow, oh;
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
if ((it->item->queued) || (!it->item->mincalcd))
{
it->wd->show_item = it;
@ -4448,7 +4388,7 @@ elm_genlist_item_update(Elm_Gen_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
if (!it->item->block) return;
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
it->item->mincalcd = EINA_FALSE;
it->item->updateme = EINA_TRUE;
it->item->block->updateme = EINA_TRUE;
@ -4463,7 +4403,7 @@ elm_genlist_item_fields_update(Elm_Genlist_Item *it,
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
if (!it->item->block) return;
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
if ((!itf) || (itf & ELM_GENLIST_ITEM_FIELD_LABEL))
_item_label_realize(it, it->base.view, &it->labels, parts);
@ -4485,7 +4425,7 @@ elm_genlist_item_item_class_update(Elm_Gen_Item *it,
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
if (!it->item->block) return;
EINA_SAFETY_ON_NULL_RETURN(itc);
if (it->delete_me) return;
if (it->generation < it->wd->generation) return;
it->itc = itc;
it->item->nocache = EINA_TRUE;
elm_genlist_item_update(it);
@ -4495,7 +4435,7 @@ EAPI const Elm_Genlist_Item_Class *
elm_genlist_item_item_class_get(const Elm_Gen_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
if (it->delete_me) return NULL;
if (it->generation < it->wd->generation) return NULL;
return it->itc;
}
@ -4929,7 +4869,7 @@ elm_genlist_item_mode_set(Elm_Gen_Item *it,
if (!wd) return;
if (!mode_type) return;
if ((it->delete_me) || (it->disabled)) return;
if ((it->generation < it->wd->generation) || (it->disabled)) return;
if ((wd->mode_item == it) &&
(!strcmp(mode_type, wd->mode_type)) &&
@ -5166,7 +5106,7 @@ void
_elm_genlist_item_del_notserious(Elm_Gen_Item *it)
{
elm_widget_item_pre_notify_del(it);
it->delete_me = EINA_TRUE;
it->generation = it->wd->generation - 1; /* This means that the item is deleted */
if (it->selected) it->wd->selected = eina_list_remove(it->wd->selected, it);
if (it->itc->func.del)

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

@ -1,66 +0,0 @@
#include <Elementary.h>
#include <Elementary_Cursor.h>
#include "elm_priv.h"
typedef struct _Pan Pan;
struct _Pan
{
Evas_Object_Smart_Clipped_Data __clipped_data;
Widget_Data *wd;
Ecore_Job *resize_job;
};
Elm_Gen_Item *
_elm_genlist_item_new(Widget_Data *wd,
const Elm_Gen_Item_Class *itc,
const void *data,
Elm_Gen_Item *parent,
Evas_Smart_Cb func,
const void *func_data);
Evas_Object *
_elm_genlist_item_widget_get(const Elm_Gen_Item *it);
void
_elm_genlist_page_relative_set(Evas_Object *obj,
double h_pagerel,
double v_pagerel);
void
_elm_genlist_page_relative_get(const Evas_Object *obj,
double *h_pagerel,
double *v_pagerel);
void
_elm_genlist_page_size_set(Evas_Object *obj,
Evas_Coord h_pagesize,
Evas_Coord v_pagesize);
void
_elm_genlist_current_page_get(const Evas_Object *obj,
int *h_pagenumber,
int *v_pagenumber);
void
_elm_genlist_last_page_get(const Evas_Object *obj,
int *h_pagenumber,
int *v_pagenumber);
void
_elm_genlist_page_show(const Evas_Object *obj,
int h_pagenumber,
int v_pagenumber);
void
_elm_genlist_page_bring_in(const Evas_Object *obj,
int h_pagenumber,
int v_pagenumber);
void
_elm_genlist_item_unrealize(Elm_Gen_Item *it,
Eina_Bool calc);
void
_elm_genlist_item_del_serious(Elm_Gen_Item *it);
void
_elm_genlist_item_del_notserious(Elm_Gen_Item *it);