#include <Elementary.h>
#include <Elementary_Cursor.h>
#include "elm_priv.h"
+#include "els_scroller.h"
#define SWIPE_MOVES 12
#define MAX_ITEMS_PER_BLOCK 32
struct _Widget_Data
{
- Evas_Object *obj, *scr, *pan_smart;
- Eina_Inlist *items, *blocks;
- Eina_List *group_items;
- Pan *pan;
- Evas_Coord pan_x, pan_y, old_pan_y, w, h, minw, minh, realminw, prev_viewport_w;
+ 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_Inlist *items; /* inlist of all items */
+ 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'. */
+ Eina_List *group_items; /* list of groups index items */
+ Pan *pan; /* pan_smart object's smart data */
+ Evas_Coord pan_x, pan_y, reorder_old_pan_y, w, h, minw, minh, realminw, prev_viewport_w;
Ecore_Job *calc_job, *update_job;
Ecore_Idle_Enterer *queue_idle_enterer;
Ecore_Idler *must_recalc_idler;
Eina_List *queue, *selected;
- Elm_Genlist_Item *show_item, *last_selected_item, *anchor_item, *mode_item, *reorder_it, *reorder_rel, *expanded_item;
- Eina_Inlist *item_cache;
- Evas_Coord anchor_y, reorder_start_y;
+ Elm_Genlist_Item *show_item, *anchor_item, *mode_item, *reorder_rel, *expanded_item;
+ Elm_Genlist_Item *last_selected_item; /* the last selected item. */
+ Elm_Genlist_Item *reorder_it; /* an item which is longpressed and in the moving state. */
+ Eina_Inlist *item_cache; /* an inlist of edje object item cache. */
+ Evas_Coord anchor_y;
+ Evas_Coord reorder_start_y; /* reorder item's initial y coordinate in the pan. */
Elm_List_Mode mode;
Ecore_Timer *multi_timer, *scr_hold_timer;
Ecore_Animator *reorder_move_animator;
Eina_Bool reorder_mode : 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;
+ int item_cache_max; /* maximum number of cached items */
int movements;
int walking;
int item_width;
int item_height;
int group_item_width;
int group_item_height;
- int max_items_per_block;
- double longpress_timeout;
+ 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
const char *source);
static Eina_Bool _deselect_all_items(Widget_Data *wd);
static void _pan_calculate(Evas_Object *obj);
+static void _pan_max_get(Evas_Object *obj,
+ Evas_Coord *x,
+ Evas_Coord *y);
static void _item_position(Elm_Genlist_Item *it,
Evas_Object *obj,
Evas_Coord it_x,
if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE;
Evas_Event_Key_Down *ev = event_info;
Widget_Data *wd = elm_widget_data_get(obj);
+ Evas_Coord pan_max_x = 0, pan_max_y = 0;
if (!wd) return EINA_FALSE;
if (!wd->items) return EINA_FALSE;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
else return EINA_FALSE;
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+ _pan_max_get(wd->pan_smart, &pan_max_x, &pan_max_y);
+ if (x < 0) x = 0;
+ if (x > pan_max_x) x = pan_max_x;
+ if (y < 0) y = 0;
+ if (y > pan_max_y) y = pan_max_y;
elm_smart_scroller_child_pos_set(wd->scr, x, y);
return EINA_TRUE;
}
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
+ elm_genlist_clear(obj);
evas_object_del(wd->pan_smart);
wd->pan_smart = NULL;
- elm_genlist_clear(obj);
}
static void
}
static void
+_translate_hook(Evas_Object *obj)
+{
+ evas_object_smart_callback_call(obj, "language,changed", NULL);
+}
+
+static void
_sizing_eval(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
static void
_item_select(Elm_Genlist_Item *it)
{
+ Evas_Object *parent = it->base.widget;
+
if ((it->wd->no_select) || (it->delete_me) || (it->mode_view)) return;
if (it->selected)
{
it->selected = EINA_TRUE;
it->wd->selected = eina_list_append(it->wd->selected, it);
call:
- evas_object_ref(it->base.widget);
+ evas_object_ref(parent);
it->walking++;
it->wd->walking++;
- if (it->func.func) it->func.func((void *)it->func.data, it->base.widget, it);
+ if (it->func.func) it->func.func((void *)it->func.data, parent, it);
if (!it->delete_me)
- evas_object_smart_callback_call(it->base.widget, SIG_SELECTED, it);
+ evas_object_smart_callback_call(parent, SIG_SELECTED, it);
it->walking--;
it->wd->walking--;
if ((it->wd->clear_me) && (!it->wd->walking))
- elm_genlist_clear(it->base.widget);
+ {
+ elm_genlist_clear(parent);
+ goto end;
+ }
else
{
if ((!it->walking) && (it->delete_me))
{
if (!it->relcount) _item_del(it);
+ goto end;
}
}
it->wd->last_selected_item = it;
- evas_object_unref(it->base.widget);
+
+end:
+ evas_object_unref(parent);
}
static void
if (!it->wd->reorder_start_y)
it->wd->reorder_start_y = it->block->y + it->y;
- if (it_scrl_y < oy) y_pos = oy;
- else if (it_scrl_y + it->wd->reorder_it->h > oy+oh)
- y_pos = oy + oh - it->wd->reorder_it->h;
- else y_pos = it_scrl_y;
+ if (it_scrl_y < oy)
+ y_pos = oy;
+ else if (it_scrl_y + it->wd->reorder_it->h > oy + oh)
+ y_pos = oy + oh - it->wd->reorder_it->h;
+ else
+ y_pos = it_scrl_y;
_item_position(it, it->base.view, it->scrl_x, y_pos);
evas_object_raise(it->base.view);
elm_smart_scroller_hold_set(it->wd->scr, EINA_TRUE);
+ elm_smart_scroller_bounce_allow_set(it->wd->scr, EINA_FALSE, EINA_FALSE);
list = elm_genlist_realized_items_get(it->wd->obj);
EINA_LIST_FOREACH(list, l, it_tmp)
{
Evas_Coord it_scrl_y = ev->canvas.y - it->wd->reorder_it->dy;
- if (it->wd->reorder_rel)
+ if (it->wd->reorder_rel && (it->wd->reorder_it->parent == it->wd->reorder_rel->parent))
{
- if (it->wd->reorder_it->parent == it->wd->reorder_rel->parent)
- {
- if (it_scrl_y <= it->wd->reorder_rel->scrl_y)
- _item_move_before(it->wd->reorder_it, it->wd->reorder_rel);
- else
- _item_move_after(it->wd->reorder_it, it->wd->reorder_rel);
- }
+ if (it_scrl_y <= it->wd->reorder_rel->scrl_y)
+ _item_move_before(it->wd->reorder_it, it->wd->reorder_rel);
else
- {
- if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
- it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
- }
+ _item_move_after(it->wd->reorder_it, it->wd->reorder_rel);
+ }
+ else
+ {
+ if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
+ it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
}
edje_object_signal_emit(it->base.view, "elm,state,reorder,disabled", "elm");
it->wd->reorder_it = it->wd->reorder_rel = NULL;
elm_smart_scroller_hold_set(it->wd->scr, EINA_FALSE);
+ elm_smart_scroller_bounce_allow_set(it->wd->scr, EINA_FALSE, EINA_TRUE);
}
if (it->wd->longpressed)
{
evas_event_freeze(te);
it->nocache = EINA_FALSE;
_mode_item_unrealize(it);
+ if (it->group_item)
+ evas_object_raise(it->group_item->base.view);
snprintf(buf, sizeof(buf), "elm,state,%s,passive,finished", it->wd->mode_type);
edje_object_signal_callback_del_full(obj, buf, "elm", _mode_finished_signal_cb, it);
evas_event_thaw(te);
}
static void
+_item_del_hook(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+{
+ Elm_Genlist_Item *it = event_info;
+ if (!it) return;
+ if (it->wd->last_selected_item == it)
+ it->wd->last_selected_item = NULL;
+}
+
+static void
_item_label_realize(Elm_Genlist_Item *it,
Evas_Object *target,
Eina_List **source)
{
it->block->reorder_offset = it->wd->reorder_it->h * -1;
if (it->block->count == 1)
- it->wd->reorder_rel = it;
+ it->wd->reorder_rel = it;
}
else if ((it->wd->reorder_start_y >= it->block->y) &&
(roy - oy + (roh / 2) <= it->block->y - it->wd->pan_y))
if (vis)
{
if (it->wd->reorder_mode)
- y += _get_space_for_reorder_item(it);
+ y += _get_space_for_reorder_item(it);
git = it->group_item;
if (git)
{
Evas_Coord minw = -1, minh = 0, y = 0, ow;
int in = 0;
double t0, t;
- Eina_Bool minw_change = EINA_FALSE, changed = EINA_FALSE;
+ Eina_Bool minw_change = EINA_FALSE;
Eina_Bool did_must_recalc = EINA_FALSE;
if (!wd) return;
{
if (itb->realized) _item_block_unrealize(itb);
}
- if ((itb->changed) || (changed) ||
- ((itb->must_recalc) && (!did_must_recalc)))
+ if ((itb->changed) || ((itb->must_recalc) && (!did_must_recalc)))
{
- if ((changed) || (itb->must_recalc))
+ if (itb->must_recalc)
{
Eina_List *l;
Elm_Genlist_Item *it;
Pan *sd = evas_object_smart_data_get(obj);
Item_Block *itb;
+ if (!sd) return;
// Evas_Coord ow, oh;
// evas_object_geometry_get(obj, NULL, NULL, &ow, &oh);
// ow = sd->wd->minw - ow;
{
Pan *sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
if (x) *x = sd->wd->pan_x;
if (y) *y = sd->wd->pan_y;
}
Pan *sd = evas_object_smart_data_get(obj);
Evas_Coord ow, oh;
+ if (!sd) return;
evas_object_geometry_get(obj, NULL, NULL, &ow, &oh);
ow = sd->wd->minw - ow;
if (ow < 0) ow = 0;
{
Pan *sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
if (w) *w = sd->wd->minw;
if (h) *h = sd->wd->minh;
}
_pan_resize_job(void *data)
{
Pan *sd = data;
+ if (!sd) return;
_sizing_eval(sd->wd->obj);
sd->resize_job = NULL;
}
Pan *sd = evas_object_smart_data_get(obj);
Evas_Coord ow, oh;
+ if (!sd) return;
evas_object_geometry_get(obj, NULL, NULL, &ow, &oh);
if ((ow == w) && (oh == h)) return;
if ((sd->wd->height_for_width) && (ow != w))
{
+ /* fix me later */
if (sd->resize_job) ecore_job_del(sd->resize_job);
sd->resize_job = ecore_job_add(_pan_resize_job, sd);
}
+ sd->wd->pan_resized = EINA_TRUE;
+ evas_object_smart_changed(obj);
+ if (sd->wd->calc_job) ecore_job_del(sd->wd->calc_job);
+ sd->wd->calc_job = NULL;
+/* OLD
if (sd->wd->calc_job) ecore_job_del(sd->wd->calc_job);
sd->wd->calc_job = ecore_job_add(_calc_job, sd->wd);
+ */
}
static void
Elm_Genlist_Item *git;
Eina_List *l;
+ if (!sd) return;
evas_event_freeze(evas_object_evas_get(obj));
+
+ if (sd->wd->pan_resized)
+ {
+ _calc_job(sd->wd);
+ sd->wd->pan_resized = EINA_FALSE;
+ }
+
evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
evas_output_viewport_get(evas_object_evas_get(obj), &cvx, &cvy, &cvw, &cvh);
EINA_LIST_FOREACH(sd->wd->group_items, l, git)
_group_items_recalc(sd->wd);
if ((sd->wd->reorder_mode) && (sd->wd->reorder_it))
{
- if (sd->wd->pan_y != sd->wd->old_pan_y)
+ if (sd->wd->pan_y != sd->wd->reorder_old_pan_y)
sd->wd->reorder_pan_move = EINA_TRUE;
else sd->wd->reorder_pan_move = EINA_FALSE;
evas_object_raise(sd->wd->reorder_it->base.view);
- sd->wd->old_pan_y = sd->wd->pan_y;
+ sd->wd->reorder_old_pan_y = sd->wd->pan_y;
sd->wd->start_time = ecore_loop_time_get();
}
_item_auto_scroll(sd->wd);
{
Pan *sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
if (sd->wd->calc_job) ecore_job_del(sd->wd->calc_job);
sd->wd->calc_job = ecore_job_add(_calc_job, sd->wd);
}
evas_event_freeze(evas_object_evas_get(it->wd->obj));
_mode_item_realize(it);
+ if (it->group_item)
+ evas_object_raise(it->group_item->base.view);
_item_position(it, it->mode_view, it->scrl_x, it->scrl_y);
evas_event_thaw(evas_object_evas_get(it->wd->obj));
evas_event_thaw_eval(evas_object_evas_get(it->wd->obj));
elm_widget_can_focus_set(obj, EINA_TRUE);
elm_widget_event_hook_set(obj, _event_hook);
elm_widget_on_show_region_hook_set(obj, _show_region_hook, obj);
+ elm_widget_translate_hook_set(obj, _translate_hook);
wd->scr = elm_smart_scroller_add(e);
elm_smart_scroller_widget_set(wd->scr, obj);
it->mouse_cursor = NULL;
it->expanded_depth = 0;
elm_widget_item_text_get_hook_set(it, _item_label_hook);
+ elm_widget_item_del_cb_set(it, _item_del_hook);
if (it->parent)
{
{
if ((flags & ELM_GENLIST_ITEM_GROUP) &&
(after->flags & ELM_GENLIST_ITEM_GROUP))
- {
- Elm_Genlist_Item *it2 = NULL;
- Eina_List *ll = eina_list_last(after->items);
- if (ll) it2 = ll->data;
- else it2 = after;
-
- wd->items =
- eina_inlist_append_relative(wd->items, EINA_INLIST_GET(it),
- EINA_INLIST_GET(it2));
- it->rel = it2;
- wd->group_items = eina_list_append_relative(wd->group_items, it,
- after);
- }
+ wd->group_items = eina_list_append_relative(wd->group_items, it,
+ after);
}
else
{
it->parent->items = eina_list_append_relative(it->parent->items, it,
after);
- wd->items = eina_inlist_append_relative(wd->items, EINA_INLIST_GET(it),
- EINA_INLIST_GET(after));
- it->rel = after;
}
+ wd->items = eina_inlist_append_relative(wd->items, EINA_INLIST_GET(it),
+ EINA_INLIST_GET(after));
+ it->rel = after;
it->rel->relcount++;
it->before = EINA_FALSE;
_item_queue(wd, it);
}
else
{
+ if (!wd->state)
+ {
+ wd->state = eina_inlist_sorted_state_new();
+ }
+
if (flags & ELM_GENLIST_ITEM_GROUP)
wd->group_items = eina_list_append(wd->group_items, it);
- wd->items = eina_inlist_sorted_insert(wd->items, EINA_INLIST_GET(it),
- _elm_genlist_item_compare);
+ wd->items = eina_inlist_sorted_state_insert(wd->items, EINA_INLIST_GET(it),
+ _elm_genlist_item_compare, wd->state);
if (EINA_INLIST_GET(it)->next)
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
+ if (wd->state)
+ {
+ eina_inlist_sorted_state_free(wd->state);
+ wd->state = NULL;
+ }
if (wd->walking > 0)
{
Elm_Genlist_Item *it;
wd->show_item = NULL;
wd->pan_x = 0;
wd->pan_y = 0;
- wd->old_pan_y = 0;
+ wd->reorder_old_pan_y = 0;
wd->minw = 0;
wd->minh = 0;
if (wd->pan_smart)
evas_object_smart_callback_call(wd->pan_smart, "changed", NULL);
}
_sizing_eval(obj);
+ elm_smart_scroller_child_region_show(wd->scr, 0, 0, 0, 0);
evas_event_thaw(evas_object_evas_get(wd->obj));
evas_event_thaw_eval(evas_object_evas_get(wd->obj));
}
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return;
+ if ((!wd) || (!wd->scr)) return;
if ((policy_h >= ELM_SCROLLER_POLICY_LAST) ||
(policy_v >= ELM_SCROLLER_POLICY_LAST))
return;
- if (wd->scr)
- elm_smart_scroller_policy_set(wd->scr, policy_h, policy_v);
+ elm_smart_scroller_policy_set(wd->scr, policy_h, policy_v);
}
EAPI void