#include <Elementary.h>
#include <Elementary_Cursor.h>
#include "elm_priv.h"
+#include "els_scroller.h"
/* --
* TODO:
struct _Elm_Gengrid_Item
{
- Elm_Widget_Item base;
+ ELM_WIDGET_ITEM;
EINA_INLIST;
Evas_Object *spacer;
- const Elm_Gengrid_Item_Class *gic;
+ const Elm_Gengrid_Item_Class *itc;
+ Elm_Gengrid_Item *parent;
Ecore_Timer *long_timer;
Ecore_Animator *item_moving_effect_timer;
Widget_Data *wd;
const void *data;
} func;
- Evas_Coord x, y, dx, dy, ox, oy, tx, ty, rx, ry;
+ Evas_Coord x, y, gx, gy, dx, dy, ox, oy, tx, ty, rx, ry;
unsigned int moving_effect_start_time;
int relcount;
int walking;
+ int prev_group;
struct
{
const char *mouse_cursor;
+ Eina_Bool is_group : 1;
Eina_Bool want_unrealize : 1;
+ Eina_Bool group_realized : 1;
Eina_Bool realized : 1;
Eina_Bool dragging : 1;
Eina_Bool down : 1;
Eina_Bool display_only : 1;
Eina_Bool disabled : 1;
Eina_Bool selected : 1;
- Eina_Bool hilighted : 1;
+ Eina_Bool highlighted : 1;
Eina_Bool moving : 1;
};
struct _Widget_Data
{
+ Eina_Inlist_Sorted_State *state;
Evas_Object *self, *scr;
Evas_Object *pan_smart;
Pan *pan;
Eina_Inlist *items;
+ Eina_List *group_items;
Ecore_Job *calc_job;
Eina_List *selected;
Elm_Gengrid_Item *last_selected_item, *reorder_item;
double align_x, align_y;
Evas_Coord pan_x, pan_y, old_pan_x, old_pan_y;
- Evas_Coord item_width, item_height; /* Each item size */
+ Evas_Coord item_width, item_height; /* Each it size */
+ Evas_Coord group_item_width, group_item_height; /* Each group it size */
Evas_Coord minw, minh; /* Total obj size */
Evas_Coord reorder_item_x, reorder_item_y;
unsigned int nmax;
long count;
+ long items_lost;
int walking;
Eina_Bool horizontal : 1;
Eina_Bool move_effect_enabled : 1;
};
-#define ELM_GENGRID_ITEM_FROM_INLIST(item) \
- ((item) ? EINA_INLIST_CONTAINER_GET(item, Elm_Gengrid_Item) : NULL)
+#define ELM_GENGRID_ITEM_FROM_INLIST(it) \
+ ((it) ? EINA_INLIST_CONTAINER_GET(it, Elm_Gengrid_Item) : NULL)
struct _Pan
{
};
static const char *widtype = NULL;
-static void _item_hilight(Elm_Gengrid_Item *item);
-static void _item_unrealize(Elm_Gengrid_Item *item);
-static void _item_select(Elm_Gengrid_Item *item);
-static void _item_unselect(Elm_Gengrid_Item *item);
+static void _item_highlight(Elm_Gengrid_Item *it);
+static void _item_unrealize(Elm_Gengrid_Item *it);
+static void _item_select(Elm_Gengrid_Item *it);
+static void _item_unselect(Elm_Gengrid_Item *it);
static void _calc_job(void *data);
static void _on_focus_hook(void *data,
Evas_Object *obj);
static const char SIG_ACTIVATED[] = "activated";
static const char SIG_CLICKED_DOUBLE[] = "clicked,double";
+static const char SIG_LONGPRESSED[] = "longpressed";
static const char SIG_SELECTED[] = "selected";
static const char SIG_UNSELECTED[] = "unselected";
static const char SIG_REALIZED[] = "realized";
static const char SIG_DRAG_STOP[] = "drag,stop";
static const char SIG_DRAG[] = "drag";
static const char SIG_SCROLL[] = "scroll";
+static const char SIG_SCROLL_ANIM_START[] = "scroll,anim,start";
+static const char SIG_SCROLL_ANIM_STOP[] = "scroll,anim,stop";
static const char SIG_SCROLL_DRAG_START[] = "scroll,drag,start";
static const char SIG_SCROLL_DRAG_STOP[] = "scroll,drag,stop";
+static const char SIG_SCROLL_EDGE_TOP[] = "scroll,edge,top"; // TODO : remove this
+static const char SIG_SCROLL_EDGE_BOTTOM[] = "scroll,edge,bottom"; // TODO : remove this
+static const char SIG_SCROLL_EDGE_LEFT[] = "scroll,edge,left"; // TODO : remove this
+static const char SIG_SCROLL_EDGE_RIGHT[] = "scroll,edge,right"; // TODO : remove this
+static const char SIG_EDGE_TOP[] = "edge,top";
+static const char SIG_EDGE_BOTTOM[] = "edge,bottom";
+static const char SIG_EDGE_LEFT[] = "edge,left";
+static const char SIG_EDGE_RIGHT[] = "edge,right";
static const char SIG_MOVED[] = "moved";
static const Evas_Smart_Cb_Description _signals[] = {
{SIG_ACTIVATED, ""},
{SIG_CLICKED_DOUBLE, ""},
+ {SIG_LONGPRESSED, ""},
{SIG_SELECTED, ""},
{SIG_UNSELECTED, ""},
{SIG_REALIZED, ""},
{SIG_DRAG_STOP, ""},
{SIG_DRAG, ""},
{SIG_SCROLL, ""},
+ {SIG_SCROLL_ANIM_START, ""},
+ {SIG_SCROLL_ANIM_STOP, ""},
{SIG_SCROLL_DRAG_START, ""},
{SIG_SCROLL_DRAG_STOP, ""},
+ {SIG_SCROLL_EDGE_TOP, ""},
+ {SIG_SCROLL_EDGE_BOTTOM, ""},
+ {SIG_SCROLL_EDGE_LEFT, ""},
+ {SIG_SCROLL_EDGE_RIGHT, ""},
+ {SIG_EDGE_TOP, ""},
+ {SIG_EDGE_BOTTOM, ""},
+ {SIG_EDGE_LEFT, ""},
+ {SIG_EDGE_RIGHT, ""},
{SIG_MOVED, ""},
{NULL, NULL}
};
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
if (elm_widget_disabled_get(obj)) return EINA_FALSE;
- Elm_Gengrid_Item *item = NULL;
+ Elm_Gengrid_Item *it = NULL;
Evas_Coord x = 0;
Evas_Coord y = 0;
Evas_Coord step_x = 0;
}
else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home")))
{
- item = elm_gengrid_first_item_get(obj);
- elm_gengrid_item_bring_in(item);
+ 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")) || (!strcmp(ev->keyname, "KP_End")))
{
- item = elm_gengrid_last_item_get(obj);
- elm_gengrid_item_bring_in(item);
+ it = elm_gengrid_last_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, "Prior")) ||
- (!strcmp(ev->keyname, "KP_Prior")))
+ else if ((!strcmp(ev->keyname, "Prior")) || (!strcmp(ev->keyname, "KP_Prior")))
{
if (wd->horizontal)
{
(!strcmp(ev->keyname, "KP_Enter")) ||
(!strcmp(ev->keyname, "space")))
{
- item = elm_gengrid_selected_item_get(obj);
- evas_object_smart_callback_call(item->wd->self, SIG_ACTIVATED, item);
+ it = elm_gengrid_selected_item_get(obj);
+ evas_object_smart_callback_call(it->wd->self, SIG_ACTIVATED, it);
}
else return EINA_FALSE;
_deselect_all_items(Widget_Data *wd)
{
if (!wd->selected) return EINA_FALSE;
- while(wd->selected)
+ while (wd->selected)
elm_gengrid_item_selected_set(wd->selected->data, EINA_FALSE);
return EINA_TRUE;
_mirrored_set(Evas_Object *obj, Eina_Bool rtl)
{
Widget_Data *wd = elm_widget_data_get(obj);
- Elm_Gengrid_Item *item;
+ Elm_Gengrid_Item *it;
if (!wd) return;
elm_smart_scroller_mirrored_set(wd->scr, rtl);
if (!wd->items) return;
- item = ELM_GENGRID_ITEM_FROM_INLIST(wd->items);
+ it = ELM_GENGRID_ITEM_FROM_INLIST(wd->items);
- while (item)
+ while (it)
{
- edje_object_mirrored_set(item->base.view, rtl);
- elm_gengrid_item_update(item);
- item = ELM_GENGRID_ITEM_FROM_INLIST(EINA_INLIST_GET(item)->next);
+ edje_object_mirrored_set(VIEW(it), rtl);
+ elm_gengrid_item_update(it);
+ it = ELM_GENGRID_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
}
}
}
static void
+_signal_callback_add_hook(Evas_Object *obj,
+ const char *emission,
+ const char *source,
+ Edje_Signal_Cb func_cb,
+ void *data)
+{
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ edje_object_signal_callback_add(elm_smart_scroller_edje_object_get(wd->scr),
+ emission, source, func_cb, data);
+}
+
+static void
+_signal_callback_del_hook(Evas_Object *obj,
+ const char *emission,
+ const char *source,
+ Edje_Signal_Cb func_cb,
+ void *data)
+{
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ edje_object_signal_callback_del_full(elm_smart_scroller_edje_object_get(wd->scr),
+ emission, source, func_cb, data);
+}
+
+static void
_mouse_move(void *data,
Evas *evas __UNUSED__,
Evas_Object *obj,
void *event_info)
{
- Elm_Gengrid_Item *item = data;
+ Elm_Gengrid_Item *it = data;
Evas_Event_Mouse_Move *ev = event_info;
Evas_Coord minw = 0, minh = 0, x, y, dx, dy, adx, ady;
Evas_Coord ox, oy, ow, oh, it_scrl_x, it_scrl_y;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
{
- if (!item->wd->on_hold)
+ if (!it->wd->on_hold)
{
- item->wd->on_hold = EINA_TRUE;
- if (!item->wd->wasselected)
- _item_unselect(item);
+ it->wd->on_hold = EINA_TRUE;
+ if (!it->wd->wasselected)
+ _item_unselect(it);
}
}
- if ((item->dragging) && (item->down))
+ if ((it->dragging) && (it->down))
{
- if (item->long_timer)
+ if (it->long_timer)
{
- ecore_timer_del(item->long_timer);
- item->long_timer = NULL;
+ ecore_timer_del(it->long_timer);
+ it->long_timer = NULL;
}
- evas_object_smart_callback_call(item->wd->self, SIG_DRAG, item);
+ evas_object_smart_callback_call(it->wd->self, SIG_DRAG, it);
return;
}
- if ((!item->down) || (item->wd->longpressed))
+ if ((!it->down) || (it->wd->longpressed))
{
- if (item->long_timer)
+ if (it->long_timer)
{
- ecore_timer_del(item->long_timer);
- item->long_timer = NULL;
+ ecore_timer_del(it->long_timer);
+ it->long_timer = NULL;
}
- if ((item->wd->reorder_mode) && (item->wd->reorder_item))
+ if ((it->wd->reorder_mode) && (it->wd->reorder_item))
{
- evas_object_geometry_get(item->wd->pan_smart, &ox, &oy, &ow, &oh);
+ evas_object_geometry_get(it->wd->pan_smart, &ox, &oy, &ow, &oh);
- it_scrl_x = ev->cur.canvas.x - item->wd->reorder_item->dx;
- it_scrl_y = ev->cur.canvas.y - item->wd->reorder_item->dy;
+ it_scrl_x = ev->cur.canvas.x - it->wd->reorder_item->dx;
+ it_scrl_y = ev->cur.canvas.y - it->wd->reorder_item->dy;
- if (it_scrl_x < ox) item->wd->reorder_item_x = ox;
- else if (it_scrl_x + item->wd->item_width > ox + ow)
- item->wd->reorder_item_x = ox + ow - item->wd->item_width;
- else item->wd->reorder_item_x = it_scrl_x;
+ if (it_scrl_x < ox) it->wd->reorder_item_x = ox;
+ else if (it_scrl_x + it->wd->item_width > ox + ow)
+ it->wd->reorder_item_x = ox + ow - it->wd->item_width;
+ else it->wd->reorder_item_x = it_scrl_x;
- if (it_scrl_y < oy) item->wd->reorder_item_y = oy;
- else if (it_scrl_y + item->wd->item_height > oy + oh)
- item->wd->reorder_item_y = oy + oh - item->wd->item_height;
- else item->wd->reorder_item_y = it_scrl_y;
+ if (it_scrl_y < oy) it->wd->reorder_item_y = oy;
+ else if (it_scrl_y + it->wd->item_height > oy + oh)
+ it->wd->reorder_item_y = oy + oh - it->wd->item_height;
+ else it->wd->reorder_item_y = it_scrl_y;
- if (item->wd->calc_job) ecore_job_del(item->wd->calc_job);
- item->wd->calc_job = ecore_job_add(_calc_job, item->wd);
+ if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
+ it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
}
return;
}
- if (!item->display_only)
+ if (!it->display_only)
elm_coords_finger_size_adjust(1, &minw, 1, &minh);
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
x = ev->cur.canvas.x - x;
y = ev->cur.canvas.y - y;
- dx = x - item->dx;
+ dx = x - it->dx;
adx = dx;
if (adx < 0) adx = -dx;
- dy = y - item->dy;
+ dy = y - it->dy;
ady = dy;
if (ady < 0) ady = -dy;
minw /= 2;
if ((adx > minw) || (ady > minh))
{
const char *left_drag, *right_drag;
- if (!elm_widget_mirrored_get(item->wd->self))
+ if (!elm_widget_mirrored_get(it->wd->self))
{
left_drag = SIG_DRAG_START_LEFT;
right_drag = SIG_DRAG_START_RIGHT;
right_drag = SIG_DRAG_START_LEFT;
}
- item->dragging = 1;
- if (item->long_timer)
+ it->dragging = 1;
+ if (it->long_timer)
{
- ecore_timer_del(item->long_timer);
- item->long_timer = NULL;
+ ecore_timer_del(it->long_timer);
+ it->long_timer = NULL;
}
- if (!item->wd->wasselected)
- _item_unselect(item);
+ if (!it->wd->wasselected)
+ _item_unselect(it);
if (dy < 0)
{
if (ady > adx)
- evas_object_smart_callback_call(item->wd->self, SIG_DRAG_START_UP,
- item);
+ evas_object_smart_callback_call(it->wd->self, SIG_DRAG_START_UP,
+ it);
else
{
if (dx < 0)
- evas_object_smart_callback_call(item->wd->self,
- left_drag, item);
+ evas_object_smart_callback_call(it->wd->self,
+ left_drag, it);
}
}
else
{
if (ady > adx)
- evas_object_smart_callback_call(item->wd->self,
- SIG_DRAG_START_DOWN, item);
+ evas_object_smart_callback_call(it->wd->self,
+ SIG_DRAG_START_DOWN, it);
else
{
if (dx < 0)
- evas_object_smart_callback_call(item->wd->self,
- left_drag, item);
+ evas_object_smart_callback_call(it->wd->self,
+ left_drag, it);
else
- evas_object_smart_callback_call(item->wd->self,
- right_drag, item);
+ evas_object_smart_callback_call(it->wd->self,
+ right_drag, it);
}
}
}
static Eina_Bool
_long_press(void *data)
{
- Elm_Gengrid_Item *item = data;
+ Elm_Gengrid_Item *it = data;
- item->long_timer = NULL;
- if ((item->disabled) || (item->dragging)) return ECORE_CALLBACK_CANCEL;
- item->wd->longpressed = EINA_TRUE;
- evas_object_smart_callback_call(item->wd->self, "longpressed", item);
- if (item->wd->reorder_mode)
+ it->long_timer = NULL;
+ if ((it->disabled) || (it->dragging)) return ECORE_CALLBACK_CANCEL;
+ it->wd->longpressed = EINA_TRUE;
+ evas_object_smart_callback_call(it->wd->self, SIG_LONGPRESSED, it);
+ if (it->wd->reorder_mode)
{
- item->wd->reorder_item = item;
- evas_object_raise(item->base.view);
- elm_smart_scroller_hold_set(item->wd->scr, EINA_TRUE);
- elm_smart_scroller_bounce_allow_set(item->wd->scr, EINA_FALSE, EINA_FALSE);
- edje_object_signal_emit(item->base.view, "elm,state,reorder,enabled", "elm");
+ it->wd->reorder_item = it;
+ evas_object_raise(VIEW(it));
+ elm_smart_scroller_hold_set(it->wd->scr, EINA_TRUE);
+ elm_smart_scroller_bounce_allow_set(it->wd->scr, EINA_FALSE, EINA_FALSE);
+ edje_object_signal_emit(VIEW(it), "elm,state,reorder,enabled", "elm");
}
return ECORE_CALLBACK_CANCEL;
}
Evas_Object *obj,
void *event_info)
{
- Elm_Gengrid_Item *item = data;
+ Elm_Gengrid_Item *it = data;
Evas_Event_Mouse_Down *ev = event_info;
Evas_Coord x, y;
if (ev->button != 1) return;
- item->down = 1;
- item->dragging = 0;
+ it->down = 1;
+ it->dragging = 0;
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
- item->dx = ev->canvas.x - x;
- item->dy = ev->canvas.y - y;
- item->wd->longpressed = EINA_FALSE;
- if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) item->wd->on_hold = EINA_TRUE;
- else item->wd->on_hold = EINA_FALSE;
- item->wd->wasselected = item->selected;
- _item_hilight(item);
+ it->dx = ev->canvas.x - x;
+ it->dy = ev->canvas.y - y;
+ it->wd->longpressed = EINA_FALSE;
+ if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE;
+ else it->wd->on_hold = EINA_FALSE;
+ it->wd->wasselected = it->selected;
+ _item_highlight(it);
if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
{
- evas_object_smart_callback_call(item->wd->self, SIG_CLICKED_DOUBLE, item);
- evas_object_smart_callback_call(item->wd->self, SIG_ACTIVATED, item);
+ evas_object_smart_callback_call(it->wd->self, SIG_CLICKED_DOUBLE, it);
+ evas_object_smart_callback_call(it->wd->self, SIG_ACTIVATED, it);
}
- if (item->long_timer) ecore_timer_del(item->long_timer);
- if (item->realized)
- item->long_timer = ecore_timer_add(_elm_config->longpress_timeout,
- _long_press, item);
+ if (it->long_timer) ecore_timer_del(it->long_timer);
+ if (it->realized)
+ it->long_timer = ecore_timer_add(_elm_config->longpress_timeout,
+ _long_press, it);
else
- item->long_timer = NULL;
+ it->long_timer = NULL;
}
static void
Evas_Object *obj __UNUSED__,
void *event_info)
{
- Elm_Gengrid_Item *item = data;
+ Elm_Gengrid_Item *it = data;
Evas_Event_Mouse_Up *ev = event_info;
Eina_Bool dragged = EINA_FALSE;
if (ev->button != 1) return;
- item->down = EINA_FALSE;
- if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) item->wd->on_hold = EINA_TRUE;
- else item->wd->on_hold = EINA_FALSE;
- if (item->long_timer)
+ it->down = EINA_FALSE;
+ if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE;
+ else it->wd->on_hold = EINA_FALSE;
+ if (it->long_timer)
{
- ecore_timer_del(item->long_timer);
- item->long_timer = NULL;
+ ecore_timer_del(it->long_timer);
+ it->long_timer = NULL;
}
- if (item->dragging)
+ if (it->dragging)
{
- item->dragging = EINA_FALSE;
- evas_object_smart_callback_call(item->wd->self, SIG_DRAG_STOP, item);
+ it->dragging = EINA_FALSE;
+ evas_object_smart_callback_call(it->wd->self, SIG_DRAG_STOP, it);
dragged = EINA_TRUE;
}
- if (item->wd->on_hold)
+ if (it->wd->on_hold)
{
- item->wd->longpressed = EINA_FALSE;
- item->wd->on_hold = EINA_FALSE;
+ it->wd->longpressed = EINA_FALSE;
+ it->wd->on_hold = EINA_FALSE;
return;
}
- if ((item->wd->reorder_mode) && (item->wd->reorder_item))
+ if ((it->wd->reorder_mode) && (it->wd->reorder_item))
{
- if (item->wd->calc_job) ecore_job_del(item->wd->calc_job);
- item->wd->calc_job = ecore_job_add(_calc_job, item->wd);
+ evas_object_smart_callback_call(it->wd->self, SIG_MOVED, it->wd->reorder_item);
+ it->wd->reorder_item = NULL;
+ it->wd->move_effect_enabled = EINA_FALSE;
+ if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
+ it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
- evas_object_smart_callback_call(item->wd->self, SIG_MOVED, item->wd->reorder_item);
- item->wd->reorder_item = NULL;
- elm_smart_scroller_hold_set(item->wd->scr, EINA_FALSE);
- elm_smart_scroller_bounce_allow_set(item->wd->scr, item->wd->h_bounce, item->wd->v_bounce);
- edje_object_signal_emit(item->base.view, "elm,state,reorder,disabled", "elm");
+ elm_smart_scroller_hold_set(it->wd->scr, EINA_FALSE);
+ elm_smart_scroller_bounce_allow_set(it->wd->scr, it->wd->h_bounce, it->wd->v_bounce);
+ edje_object_signal_emit(VIEW(it), "elm,state,reorder,disabled", "elm");
}
- if (item->wd->longpressed)
+ if (it->wd->longpressed)
{
- item->wd->longpressed = EINA_FALSE;
- if (!item->wd->wasselected) _item_unselect(item);
- item->wd->wasselected = EINA_FALSE;
+ it->wd->longpressed = EINA_FALSE;
+ if (!it->wd->wasselected) _item_unselect(it);
+ it->wd->wasselected = EINA_FALSE;
return;
}
if (dragged)
{
- if (item->want_unrealize) _item_unrealize(item);
+ if (it->want_unrealize) _item_unrealize(it);
}
- if ((item->disabled) || (dragged)) return;
- if (item->wd->multi)
+ if ((it->disabled) || (dragged)) return;
+ if (it->wd->multi)
{
- if (!item->selected)
+ if (!it->selected)
{
- _item_hilight(item);
- _item_select(item);
+ _item_highlight(it);
+ _item_select(it);
}
- else _item_unselect(item);
+ else _item_unselect(it);
}
else
{
- if (!item->selected)
+ if (!it->selected)
{
- while (item->wd->selected)
- _item_unselect(item->wd->selected->data);
+ while (it->wd->selected)
+ _item_unselect(it->wd->selected->data);
}
else
{
const Eina_List *l, *l_next;
Elm_Gengrid_Item *item2;
- EINA_LIST_FOREACH_SAFE(item->wd->selected, l, l_next, item2)
- if (item2 != item) _item_unselect(item2);
+ EINA_LIST_FOREACH_SAFE(it->wd->selected, l, l_next, item2)
+ if (item2 != it) _item_unselect(item2);
}
- _item_hilight(item);
- _item_select(item);
+ _item_highlight(it);
+ _item_select(it);
}
}
static void
-_item_hilight(Elm_Gengrid_Item *item)
+_item_highlight(Elm_Gengrid_Item *it)
{
- if ((item->wd->no_select) || (item->delete_me) || (item->hilighted)) return;
- edje_object_signal_emit(item->base.view, "elm,state,selected", "elm");
- item->hilighted = EINA_TRUE;
+ if ((it->wd->no_select) || (it->delete_me) || (it->highlighted)) return;
+ edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
+ it->highlighted = EINA_TRUE;
}
static void
-_item_realize(Elm_Gengrid_Item *item)
+_item_realize(Elm_Gengrid_Item *it)
{
char buf[1024];
char style[1024];
- if ((item->realized) || (item->delete_me)) return;
- item->base.view = edje_object_add(evas_object_evas_get(item->wd->self));
- edje_object_scale_set(item->base.view, elm_widget_scale_get(item->wd->self) *
+ if ((it->realized) || (it->delete_me)) return;
+ VIEW(it) = edje_object_add(evas_object_evas_get(it->wd->self));
+ edje_object_scale_set(VIEW(it), elm_widget_scale_get(it->wd->self) *
_elm_config->scale);
- edje_object_mirrored_set(item->base.view, elm_widget_mirrored_get(item->base.widget));
- evas_object_smart_member_add(item->base.view, item->wd->pan_smart);
- elm_widget_sub_object_add(item->wd->self, item->base.view);
+ edje_object_mirrored_set(VIEW(it), elm_widget_mirrored_get(WIDGET(it)));
+ evas_object_smart_member_add(VIEW(it), it->wd->pan_smart);
+ elm_widget_sub_object_add(it->wd->self, VIEW(it));
snprintf(style, sizeof(style), "item/%s",
- item->gic->item_style ? item->gic->item_style : "default");
- _elm_theme_object_set(item->wd->self, item->base.view, "gengrid", style,
- elm_widget_style_get(item->wd->self));
- item->spacer =
- evas_object_rectangle_add(evas_object_evas_get(item->wd->self));
- evas_object_color_set(item->spacer, 0, 0, 0, 0);
- elm_widget_sub_object_add(item->wd->self, item->spacer);
- evas_object_size_hint_min_set(item->spacer, 2 * _elm_config->scale, 1);
- edje_object_part_swallow(item->base.view, "elm.swallow.pad", item->spacer);
-
- if (item->gic->func.label_get)
+ it->itc->item_style ? it->itc->item_style : "default");
+ _elm_theme_object_set(it->wd->self, VIEW(it), "gengrid", style,
+ elm_widget_style_get(it->wd->self));
+ it->spacer =
+ evas_object_rectangle_add(evas_object_evas_get(it->wd->self));
+ evas_object_color_set(it->spacer, 0, 0, 0, 0);
+ elm_widget_sub_object_add(it->wd->self, it->spacer);
+ evas_object_size_hint_min_set(it->spacer, 2 * _elm_config->scale, 1);
+ edje_object_part_swallow(VIEW(it), "elm.swallow.pad", it->spacer);
+
+ if (it->itc->func.label_get)
{
const Eina_List *l;
const char *key;
- item->labels =
- elm_widget_stringlist_get(edje_object_data_get(item->base.view,
+ it->labels =
+ elm_widget_stringlist_get(edje_object_data_get(VIEW(it),
"labels"));
- EINA_LIST_FOREACH(item->labels, l, key)
+ EINA_LIST_FOREACH(it->labels, l, key)
{
- char *s = item->gic->func.label_get
- ((void *)item->base.data, item->wd->self, l->data);
+ char *s = it->itc->func.label_get
+ ((void *)it->base.data, it->wd->self, l->data);
if (s)
{
- edje_object_part_text_set(item->base.view, l->data, s);
+ edje_object_part_text_set(VIEW(it), l->data, s);
free(s);
}
}
}
- if (item->gic->func.icon_get)
+ if (it->itc->func.icon_get)
{
const Eina_List *l;
const char *key;
- item->icons =
- elm_widget_stringlist_get(edje_object_data_get(item->base.view,
+ it->icons =
+ elm_widget_stringlist_get(edje_object_data_get(VIEW(it),
"icons"));
- EINA_LIST_FOREACH(item->icons, l, key)
+ EINA_LIST_FOREACH(it->icons, l, key)
{
- Evas_Object *ic = item->gic->func.icon_get
- ((void *)item->base.data, item->wd->self, l->data);
+ Evas_Object *ic = it->itc->func.icon_get
+ ((void *)it->base.data, it->wd->self, l->data);
if (ic)
{
- item->icon_objs = eina_list_append(item->icon_objs, ic);
- edje_object_part_swallow(item->base.view, key, ic);
+ it->icon_objs = eina_list_append(it->icon_objs, ic);
+ edje_object_part_swallow(VIEW(it), key, ic);
evas_object_show(ic);
- elm_widget_sub_object_add(item->wd->self, ic);
+ elm_widget_sub_object_add(it->wd->self, ic);
}
}
}
- if (item->gic->func.state_get)
+ if (it->itc->func.state_get)
{
const Eina_List *l;
const char *key;
- item->states =
- elm_widget_stringlist_get(edje_object_data_get(item->base.view,
+ it->states =
+ elm_widget_stringlist_get(edje_object_data_get(VIEW(it),
"states"));
- EINA_LIST_FOREACH(item->states, l, key)
+ EINA_LIST_FOREACH(it->states, l, key)
{
- Eina_Bool on = item->gic->func.state_get
- ((void *)item->base.data, item->wd->self, l->data);
+ Eina_Bool on = it->itc->func.state_get
+ ((void *)it->base.data, it->wd->self, l->data);
if (on)
{
snprintf(buf, sizeof(buf), "elm,state,%s,active", key);
- edje_object_signal_emit(item->base.view, buf, "elm");
+ edje_object_signal_emit(VIEW(it), buf, "elm");
}
}
}
- if ((!item->wd->item_width) && (!item->wd->item_height))
+ if (it->is_group)
{
- edje_object_size_min_restricted_calc(item->base.view,
- &item->wd->item_width,
- &item->wd->item_height,
- item->wd->item_width,
- item->wd->item_height);
- elm_coords_finger_size_adjust(1, &item->wd->item_width,
- 1, &item->wd->item_height);
+ if ((!it->wd->group_item_width) && (!it->wd->group_item_height))
+ {
+ edje_object_size_min_restricted_calc(VIEW(it),
+ &it->wd->group_item_width,
+ &it->wd->group_item_height,
+ it->wd->group_item_width,
+ it->wd->group_item_height);
+ }
}
+ else
+ {
+ if ((!it->wd->item_width) && (!it->wd->item_height))
+ {
+ edje_object_size_min_restricted_calc(VIEW(it),
+ &it->wd->item_width,
+ &it->wd->item_height,
+ it->wd->item_width,
+ it->wd->item_height);
+ elm_coords_finger_size_adjust(1, &it->wd->item_width,
+ 1, &it->wd->item_height);
+ }
- evas_object_event_callback_add(item->base.view, EVAS_CALLBACK_MOUSE_DOWN,
- _mouse_down, item);
- evas_object_event_callback_add(item->base.view, EVAS_CALLBACK_MOUSE_UP,
- _mouse_up, item);
- evas_object_event_callback_add(item->base.view, EVAS_CALLBACK_MOUSE_MOVE,
- _mouse_move, item);
-
- if (item->selected)
- edje_object_signal_emit(item->base.view, "elm,state,selected", "elm");
- if (item->disabled)
- edje_object_signal_emit(item->base.view, "elm,state,disabled", "elm");
+ evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MOUSE_DOWN,
+ _mouse_down, it);
+ evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MOUSE_UP,
+ _mouse_up, it);
+ evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MOUSE_MOVE,
+ _mouse_move, it);
- evas_object_show(item->base.view);
+ if (it->selected)
+ edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
+ if (it->disabled)
+ edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
+ }
+ evas_object_show(VIEW(it));
- if (item->tooltip.content_cb)
+ if (it->tooltip.content_cb)
{
- elm_widget_item_tooltip_content_cb_set(item,
- item->tooltip.content_cb,
- item->tooltip.data, NULL);
- elm_widget_item_tooltip_style_set(item, item->tooltip.style);
- elm_widget_item_tooltip_size_restrict_disable(item, item->tooltip.free_size);
+ elm_widget_item_tooltip_content_cb_set(it,
+ it->tooltip.content_cb,
+ it->tooltip.data, NULL);
+ elm_widget_item_tooltip_style_set(it, it->tooltip.style);
+ elm_widget_item_tooltip_size_restrict_disable(it, it->tooltip.free_size);
}
- if (item->mouse_cursor)
- elm_widget_item_cursor_set(item, item->mouse_cursor);
+ if (it->mouse_cursor)
+ elm_widget_item_cursor_set(it, it->mouse_cursor);
- item->realized = EINA_TRUE;
- item->want_unrealize = EINA_FALSE;
+ it->realized = EINA_TRUE;
+ it->want_unrealize = EINA_FALSE;
}
static void
-_item_unrealize(Elm_Gengrid_Item *item)
+_item_unrealize(Elm_Gengrid_Item *it)
{
Evas_Object *icon;
- if (!item->realized) return;
- if (item->long_timer)
- {
- ecore_timer_del(item->long_timer);
- item->long_timer = NULL;
- }
- evas_object_del(item->base.view);
- item->base.view = NULL;
- evas_object_del(item->spacer);
- item->spacer = NULL;
- elm_widget_stringlist_free(item->labels);
- item->labels = NULL;
- elm_widget_stringlist_free(item->icons);
- item->icons = NULL;
- elm_widget_stringlist_free(item->states);
- item->states = NULL;
-
- EINA_LIST_FREE(item->icon_objs, icon)
+ if (!it->realized) return;
+ evas_object_smart_callback_call(WIDGET(it), SIG_UNREALIZED, it);
+ if (it->long_timer)
+ {
+ ecore_timer_del(it->long_timer);
+ it->long_timer = NULL;
+ }
+ evas_object_del(VIEW(it));
+ VIEW(it) = NULL;
+ evas_object_del(it->spacer);
+ it->spacer = NULL;
+ elm_widget_stringlist_free(it->labels);
+ it->labels = NULL;
+ elm_widget_stringlist_free(it->icons);
+ it->icons = NULL;
+ elm_widget_stringlist_free(it->states);
+ it->states = NULL;
+
+ EINA_LIST_FREE(it->icon_objs, icon)
evas_object_del(icon);
- item->realized = EINA_FALSE;
- item->want_unrealize = EINA_FALSE;
+ it->realized = EINA_FALSE;
+ it->want_unrealize = EINA_FALSE;
}
static Eina_Bool
_reorder_item_moving_effect_timer_cb(void *data)
{
- Elm_Gengrid_Item *item = data;
+ Elm_Gengrid_Item *it = data;
double time, t;
Evas_Coord dx, dy;
time = REORDER_EFFECT_TIME;
- t = ((0.0 > (t = ecore_loop_time_get()-item->moving_effect_start_time)) ? 0.0 : t);
- dx = ((item->tx - item->ox) / 10) * _elm_config->scale;
- dy = ((item->ty - item->oy) / 10) * _elm_config->scale;
+ t = ((0.0 > (t = ecore_loop_time_get()-it->moving_effect_start_time)) ? 0.0 : t);
+ dx = ((it->tx - it->ox) / 10) * _elm_config->scale;
+ dy = ((it->ty - it->oy) / 10) * _elm_config->scale;
if (t <= time)
{
- item->rx += (1 * sin((t / time) * (M_PI / 2)) * dx);
- item->ry += (1 * sin((t / time) * (M_PI / 2)) * dy);
+ it->rx += (1 * sin((t / time) * (M_PI / 2)) * dx);
+ it->ry += (1 * sin((t / time) * (M_PI / 2)) * dy);
}
else
{
- item->rx += dx;
- item->ry += dy;
+ it->rx += dx;
+ it->ry += dy;
}
- if ((((dx > 0) && (item->rx >= item->tx)) || ((dx <= 0) && (item->rx <= item->tx))) &&
- (((dy > 0) && (item->ry >= item->ty)) || ((dy <= 0) && (item->ry <= item->ty))))
+ if ((((dx > 0) && (it->rx >= it->tx)) || ((dx <= 0) && (it->rx <= it->tx))) &&
+ (((dy > 0) && (it->ry >= it->ty)) || ((dy <= 0) && (it->ry <= it->ty))))
{
- evas_object_move(item->base.view, item->tx, item->ty);
- evas_object_resize(item->base.view, item->wd->item_width, item->wd->item_height);
- item->moving = EINA_FALSE;
- item->item_moving_effect_timer = NULL;
+ evas_object_move(VIEW(it), it->tx, it->ty);
+ if (it->is_group)
+ {
+ Evas_Coord vw, vh;
+ evas_object_geometry_get(it->wd->pan_smart, NULL, NULL, &vw, &vh);
+ if (it->wd->horizontal)
+ evas_object_resize(VIEW(it), it->wd->group_item_width, vh);
+ else
+ evas_object_resize(VIEW(it), vw, it->wd->group_item_height);
+ }
+ else
+ evas_object_resize(VIEW(it), it->wd->item_width, it->wd->item_height);
+ it->moving = EINA_FALSE;
+ it->item_moving_effect_timer = NULL;
return ECORE_CALLBACK_CANCEL;
}
- evas_object_move(item->base.view, item->rx, item->ry);
- evas_object_resize(item->base.view, item->wd->item_width, item->wd->item_height);
+ evas_object_move(VIEW(it), it->rx, it->ry);
+ if (it->is_group)
+ {
+ Evas_Coord vw, vh;
+ evas_object_geometry_get(it->wd->pan_smart, NULL, NULL, &vw, &vh);
+ if (it->wd->horizontal)
+ evas_object_resize(VIEW(it), it->wd->group_item_width, vh);
+ else
+ evas_object_resize(VIEW(it), vw, it->wd->group_item_height);
+ }
+ else
+ evas_object_resize(VIEW(it), it->wd->item_width, it->wd->item_height);
return ECORE_CALLBACK_RENEW;
}
static void
-_item_place(Elm_Gengrid_Item *item,
+_group_item_place(Pan *sd)
+{
+ Evas_Coord iw, ih, vw, vh;
+ Eina_List *l;
+ Eina_Bool was_realized;
+ Elm_Gengrid_Item *it;
+ evas_object_geometry_get(sd->wd->pan_smart, NULL, NULL, &vw, &vh);
+ if (sd->wd->horizontal)
+ {
+ iw = sd->wd->group_item_width;
+ ih = vh;
+ }
+ else
+ {
+ iw = vw;
+ ih = sd->wd->group_item_height;
+ }
+ EINA_LIST_FOREACH(sd->wd->group_items, l, it)
+ {
+ was_realized = it->realized;
+ if (it->group_realized)
+ {
+ _item_realize(it);
+ if (!was_realized)
+ evas_object_smart_callback_call(it->wd->self, SIG_REALIZED, it);
+ evas_object_move(VIEW(it), it->gx, it->gy);
+ evas_object_resize(VIEW(it), iw, ih);
+ evas_object_raise(VIEW(it));
+ }
+ else
+ _item_unrealize(it);
+ }
+}
+
+
+static void
+_item_place(Elm_Gengrid_Item *it,
Evas_Coord cx,
Evas_Coord cy)
{
- Evas_Coord x, y, ox, oy, cvx, cvy, cvw, cvh;
+ Evas_Coord x, y, ox, oy, cvx, cvy, cvw, cvh, iw, ih, ww;
Evas_Coord tch, tcw, alignw = 0, alignh = 0, vw, vh;
Eina_Bool reorder_item_move_forward = EINA_FALSE;
- item->x = cx;
- item->y = cy;
- evas_object_geometry_get(item->wd->pan_smart, &ox, &oy, &vw, &vh);
+ long items_count;
+ it->x = cx;
+ it->y = cy;
+ evas_object_geometry_get(it->wd->pan_smart, &ox, &oy, &vw, &vh);
/* Preload rows/columns at each side of the Gengrid */
- cvx = ox - PRELOAD * item->wd->item_width;
- cvy = oy - PRELOAD * item->wd->item_height;
- cvw = vw + 2 * PRELOAD * item->wd->item_width;
- cvh = vh + 2 * PRELOAD * item->wd->item_height;
+ cvx = ox - PRELOAD * it->wd->item_width;
+ cvy = oy - PRELOAD * it->wd->item_height;
+ cvw = vw + 2 * PRELOAD * it->wd->item_width;
+ cvh = vh + 2 * PRELOAD * it->wd->item_height;
alignh = 0;
alignw = 0;
- if (item->wd->horizontal)
+ items_count = it->wd->count - eina_list_count(it->wd->group_items) + it->wd->items_lost;
+ if (it->wd->horizontal)
{
int columns, items_visible = 0, items_row;
- if (item->wd->item_height > 0)
- items_visible = vh / item->wd->item_height;
+ if (it->wd->item_height > 0)
+ items_visible = vh / it->wd->item_height;
if (items_visible < 1)
items_visible = 1;
- columns = item->wd->count / items_visible;
- if (item->wd->count % items_visible)
+ columns = items_count / items_visible;
+ if (items_count % items_visible)
columns++;
- tcw = item->wd->item_width * columns;
- alignw = (vw - tcw) * item->wd->align_x;
+ tcw = (it->wd->item_width * columns) + (it->wd->group_item_width * eina_list_count(it->wd->group_items));
+ alignw = (vw - tcw) * it->wd->align_x;
items_row = items_visible;
- if (items_row > item->wd->count)
- items_row = item->wd->count;
- tch = items_row * item->wd->item_height;
- alignh = (vh - tch) * item->wd->align_y;
+ if (items_row > it->wd->count)
+ items_row = it->wd->count;
+ tch = items_row * it->wd->item_height;
+ alignh = (vh - tch) * it->wd->align_y;
}
else
{
int rows, items_visible = 0, items_col;
- if (item->wd->item_width > 0)
- items_visible = vw / item->wd->item_width;
+ if (it->wd->item_width > 0)
+ items_visible = vw / it->wd->item_width;
if (items_visible < 1)
items_visible = 1;
- rows = item->wd->count / items_visible;
- if (item->wd->count % items_visible)
+ rows = items_count / items_visible;
+ if (items_count % items_visible)
rows++;
- tch = item->wd->item_height * rows;
- alignh = (vh - tch) * item->wd->align_y;
+ tch = (it->wd->item_height * rows) + (it->wd->group_item_height * eina_list_count(it->wd->group_items));
+ alignh = (vh - tch) * it->wd->align_y;
items_col = items_visible;
- if (items_col > item->wd->count)
- items_col = item->wd->count;
- tcw = items_col * item->wd->item_width;
- alignw = (vw - tcw) * item->wd->align_x;
+ if (items_col > it->wd->count)
+ items_col = it->wd->count;
+ tcw = items_col * it->wd->item_width;
+ alignw = (vw - tcw) * it->wd->align_x;
}
- x = cx * item->wd->item_width - item->wd->pan_x + ox + alignw;
- if (elm_widget_mirrored_get(item->wd->self))
- { /* Switch items side and componsate for pan_x when in RTL mode */
- Evas_Coord ww;
- evas_object_geometry_get(item->wd->self, NULL, NULL, &ww, NULL);
- x = ww - x - item->wd->item_width - item->wd->pan_x - item->wd->pan_x;
+ if (it->is_group)
+ {
+ if (it->wd->horizontal)
+ {
+ x = (((cx - it->prev_group) * it->wd->item_width) + (it->prev_group * it->wd->group_item_width)) - it->wd->pan_x + ox + alignw;
+ y = 0;
+ iw = it->wd->group_item_width;
+ ih = vh;
+ }
+ else
+ {
+ x = 0;
+ y = (((cy - it->prev_group) * it->wd->item_height) + (it->prev_group * it->wd->group_item_height)) - it->wd->pan_y + oy + alignh;
+ iw = vw;
+ ih = it->wd->group_item_height;
+ }
+ it->gx = x;
+ it->gy = y;
+ }
+ else
+ {
+ if (it->wd->horizontal)
+ {
+ x = (((cx - it->prev_group) * it->wd->item_width) + (it->prev_group * it->wd->group_item_width)) - it->wd->pan_x + ox + alignw;
+ y = (cy * it->wd->item_height) - it->wd->pan_y + oy + alignh;
+ }
+ else
+ {
+ x = (cx * it->wd->item_width) - it->wd->pan_x + ox + alignw;
+ y = (((cy - it->prev_group) * it->wd->item_height) + (it->prev_group * it->wd->group_item_height)) - it->wd->pan_y + oy + alignh;
+ }
+ if (elm_widget_mirrored_get(it->wd->self))
+ { /* Switch items side and componsate for pan_x when in RTL mode */
+ evas_object_geometry_get(it->wd->self, NULL, NULL, &ww, NULL);
+ x = ww - x - it->wd->item_width - it->wd->pan_x - it->wd->pan_x;
+ }
+ iw = it->wd->item_width;
+ ih = it->wd->item_height;
}
- y = cy * item->wd->item_height - item->wd->pan_y + oy + alignh;
-
- Eina_Bool was_realized = item->realized;
- if (ELM_RECTS_INTERSECT(x, y, item->wd->item_width, item->wd->item_height,
- cvx, cvy, cvw, cvh))
+ Eina_Bool was_realized = it->realized;
+ if (ELM_RECTS_INTERSECT(x, y, iw, ih, cvx, cvy, cvw, cvh))
{
- _item_realize(item);
+ _item_realize(it);
if (!was_realized)
- evas_object_smart_callback_call(item->wd->self, SIG_REALIZED, item);
- if ((item->wd->reorder_mode) && (item->wd->reorder_item))
+ evas_object_smart_callback_call(it->wd->self, SIG_REALIZED, it);
+ if (it->parent)
{
- if (item->moving) return;
-
- if (!item->wd->move_effect_enabled)
+ if (it->wd->horizontal)
{
- item->ox = x;
- item->oy = y;
+ if (it->parent->gx < 0)
+ {
+ it->parent->gx = x + it->wd->item_width - it->wd->group_item_width;
+ if (it->parent->gx > 0)
+ it->parent->gx = 0;
+ }
}
- if (item->wd->reorder_item == item)
+ else
{
- evas_object_move(item->base.view,
- item->wd->reorder_item_x, item->wd->reorder_item_y);
- evas_object_resize(item->base.view,
- item->wd->item_width, item->wd->item_height);
- return;
+ if (it->parent->gy < 0)
+ {
+ it->parent->gy = y + it->wd->item_height - it->wd->group_item_height;
+ if (it->parent->gy > 0)
+ it->parent->gy = 0;
+ }
+ it->parent->group_realized = EINA_TRUE;
}
- else
+ }
+ if (it->wd->reorder_mode)
+ {
+ if (it->wd->reorder_item)
{
- if (item->wd->move_effect_enabled)
+ if (it->moving) return;
+
+ if (!it->wd->move_effect_enabled)
{
- if ((item->ox != x) || (item->oy != y))
+ it->ox = x;
+ it->oy = y;
+ }
+ if (it->wd->reorder_item == it)
+ {
+ evas_object_move(VIEW(it),
+ it->wd->reorder_item_x, it->wd->reorder_item_y);
+ evas_object_resize(VIEW(it), iw, ih);
+ return;
+ }
+ else
+ {
+ if (it->wd->move_effect_enabled)
{
- if (((item->wd->old_pan_x == item->wd->pan_x) && (item->wd->old_pan_y == item->wd->pan_y)) ||
- ((item->wd->old_pan_x != item->wd->pan_x) && !(item->ox - item->wd->pan_x + item->wd->old_pan_x == x)) ||
- ((item->wd->old_pan_y != item->wd->pan_y) && !(item->oy - item->wd->pan_y + item->wd->old_pan_y == y)))
+ if ((it->ox != x) || (it->oy != y))
{
- item->tx = x;
- item->ty = y;
- item->rx = item->ox;
- item->ry = item->oy;
- item->moving = EINA_TRUE;
- item->moving_effect_start_time = ecore_loop_time_get();
- item->item_moving_effect_timer = ecore_animator_add(_reorder_item_moving_effect_timer_cb, item);
- return;
+ if (((it->wd->old_pan_x == it->wd->pan_x) && (it->wd->old_pan_y == it->wd->pan_y)) ||
+ ((it->wd->old_pan_x != it->wd->pan_x) && !(it->ox - it->wd->pan_x + it->wd->old_pan_x == x)) ||
+ ((it->wd->old_pan_y != it->wd->pan_y) && !(it->oy - it->wd->pan_y + it->wd->old_pan_y == y)))
+ {
+ it->tx = x;
+ it->ty = y;
+ it->rx = it->ox;
+ it->ry = it->oy;
+ it->moving = EINA_TRUE;
+ it->moving_effect_start_time = ecore_loop_time_get();
+ it->item_moving_effect_timer = ecore_animator_add(_reorder_item_moving_effect_timer_cb, it);
+ return;
+ }
}
}
- }
- if (ELM_RECTS_INTERSECT(item->wd->reorder_item_x, item->wd->reorder_item_y,
- item->wd->item_width, item->wd->item_height,
- x+(item->wd->item_width/2), y+(item->wd->item_height/2),
- 1, 1))
- {
- if (item->wd->horizontal)
+ /* need fix here */
+ Evas_Coord nx, ny, nw, nh;
+ if (it->is_group)
{
- if ((item->wd->nmax * item->wd->reorder_item->x + item->wd->reorder_item->y) >
- (item->wd->nmax * item->x + item->y))
- reorder_item_move_forward = EINA_TRUE;
+ if (it->wd->horizontal)
+ {
+ nx = x + (it->wd->group_item_width / 2);
+ ny = y;
+ nw = 1;
+ nh = vh;
+ }
+ else
+ {
+ nx = x;
+ ny = y + (it->wd->group_item_height / 2);
+ nw = vw;
+ nh = 1;
+ }
}
else
{
- if ((item->wd->nmax * item->wd->reorder_item->y + item->wd->reorder_item->x) >
- (item->wd->nmax * item->y + item->x))
- reorder_item_move_forward = EINA_TRUE;
+ nx = x + (it->wd->item_width / 2);
+ ny = y + (it->wd->item_height / 2);
+ nw = 1;
+ nh = 1;
}
- item->wd->items = eina_inlist_remove(item->wd->items,
- EINA_INLIST_GET(item->wd->reorder_item));
- if (reorder_item_move_forward)
- item->wd->items = eina_inlist_prepend_relative(item->wd->items,
- EINA_INLIST_GET(item->wd->reorder_item),
- EINA_INLIST_GET(item));
- else
- item->wd->items = eina_inlist_append_relative(item->wd->items,
- EINA_INLIST_GET(item->wd->reorder_item),
- EINA_INLIST_GET(item));
-
- item->wd->reorder_item_changed = EINA_TRUE;
- item->wd->move_effect_enabled = EINA_TRUE;
- if (item->wd->calc_job) ecore_job_del(item->wd->calc_job);
- item->wd->calc_job = ecore_job_add(_calc_job, item->wd);
+ if ( ELM_RECTS_INTERSECT(it->wd->reorder_item_x, it->wd->reorder_item_y,
+ it->wd->item_width, it->wd->item_height,
+ nx, ny, nw, nh))
+ {
+ if (it->wd->horizontal)
+ {
+ if ((it->wd->nmax * it->wd->reorder_item->x + it->wd->reorder_item->y) >
+ (it->wd->nmax * it->x + it->y))
+ reorder_item_move_forward = EINA_TRUE;
+ }
+ else
+ {
+ if ((it->wd->nmax * it->wd->reorder_item->y + it->wd->reorder_item->x) >
+ (it->wd->nmax * it->y + it->x))
+ reorder_item_move_forward = EINA_TRUE;
+ }
- return;
+ it->wd->items = eina_inlist_remove(it->wd->items,
+ EINA_INLIST_GET(it->wd->reorder_item));
+ if (reorder_item_move_forward)
+ it->wd->items = eina_inlist_prepend_relative(it->wd->items,
+ EINA_INLIST_GET(it->wd->reorder_item),
+ EINA_INLIST_GET(it));
+ else
+ it->wd->items = eina_inlist_append_relative(it->wd->items,
+ EINA_INLIST_GET(it->wd->reorder_item),
+ EINA_INLIST_GET(it));
+
+ it->wd->reorder_item_changed = EINA_TRUE;
+ it->wd->move_effect_enabled = EINA_TRUE;
+ if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
+ it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
+
+ return;
+ }
}
}
+ else if (it->item_moving_effect_timer)
+ {
+ ecore_animator_del(it->item_moving_effect_timer);
+ it->item_moving_effect_timer = NULL;
+ it->moving = EINA_FALSE;
+ }
}
- evas_object_move(item->base.view, x, y);
- evas_object_resize(item->base.view, item->wd->item_width,
- item->wd->item_height);
+ if (!it->is_group)
+ {
+ evas_object_move(VIEW(it), x, y);
+ evas_object_resize(VIEW(it), iw, ih);
+ }
+ else
+ it->group_realized = EINA_TRUE;
}
else
{
- _item_unrealize(item);
- if (was_realized)
- evas_object_smart_callback_call(item->wd->self, SIG_UNREALIZED, item);
+ if (!it->is_group)
+ _item_unrealize(it);
+ else
+ it->group_realized = EINA_FALSE;
}
}
static const char *
_item_label_hook(Elm_Gengrid_Item *it, const char *part)
{
- if (!it->gic->func.label_get) return NULL;
- return edje_object_part_text_get(it->base.view, part);
+ if (!it->itc->func.label_get) return NULL;
+ return edje_object_part_text_get(VIEW(it), part);
}
static Elm_Gengrid_Item *
-_item_create(Widget_Data *wd,
- const Elm_Gengrid_Item_Class *gic,
+_item_new(Widget_Data *wd,
+ const Elm_Gengrid_Item_Class *itc,
const void *data,
Evas_Smart_Cb func,
const void *func_data)
{
- Elm_Gengrid_Item *item;
+ Elm_Gengrid_Item *it;
- item = elm_widget_item_new(wd->self, Elm_Gengrid_Item);
- if (!item) return NULL;
+ it = elm_widget_item_new(wd->self, Elm_Gengrid_Item);
+ if (!it) return NULL;
wd->count++;
- item->wd = wd;
- item->gic = gic;
- item->base.data = data;
- item->func.func = func;
- item->func.data = func_data;
- item->mouse_cursor = NULL;
- elm_widget_item_text_get_hook_set(item, _item_label_hook);
- return item;
+ it->wd = wd;
+ it->itc = itc;
+ it->base.data = data;
+ it->func.func = func;
+ it->func.data = func_data;
+ it->mouse_cursor = NULL;
+ it->is_group = !strcmp(it->itc->item_style, "group_index");
+ elm_widget_item_text_get_hook_set(it, _item_label_hook);
+
+ return it;
}
static void
-_item_del(Elm_Gengrid_Item *item)
-{
- elm_widget_item_pre_notify_del(item);
- if (item->selected)
- item->wd->selected = eina_list_remove(item->wd->selected, item);
- if (item->realized) _item_unrealize(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_inlist_remove(item->wd->items, EINA_INLIST_GET(item));
- if (item->long_timer) ecore_timer_del(item->long_timer);
- 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--;
- if (item->wd->calc_job) ecore_job_del(item->wd->calc_job);
- item->wd->calc_job = ecore_job_add(_calc_job, item->wd);
- elm_widget_item_del(item);
+_item_del(Elm_Gengrid_Item *it)
+{
+ elm_widget_item_pre_notify_del(it);
+ if (it->selected)
+ it->wd->selected = eina_list_remove(it->wd->selected, it);
+ if (it->realized) _item_unrealize(it);
+ if ((!it->delete_me) && (it->itc->func.del))
+ it->itc->func.del((void *)it->base.data, it->wd->self);
+ it->delete_me = EINA_TRUE;
+ it->wd->items = eina_inlist_remove(it->wd->items, EINA_INLIST_GET(it));
+ if (it->long_timer) ecore_timer_del(it->long_timer);
+ if (it->tooltip.del_cb)
+ it->tooltip.del_cb((void *)it->tooltip.data, WIDGET(it), it);
+ it->wd->walking -= it->walking;
+ it->wd->count--;
+ if (it->is_group)
+ it->wd->group_items = eina_list_remove(it->wd->group_items, it);
+ if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
+ it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
+ elm_widget_item_del(it);
}
static void
-_item_select(Elm_Gengrid_Item *item)
+_item_select(Elm_Gengrid_Item *it)
{
- if ((item->wd->no_select) || (item->delete_me)) return;
- if (item->selected)
+ if ((it->wd->no_select) || (it->delete_me)) return;
+ if (it->selected)
{
- if (item->wd->always_select) goto call;
+ if (it->wd->always_select) goto call;
return;
}
- item->selected = EINA_TRUE;
- item->wd->selected = eina_list_append(item->wd->selected, item);
+ it->selected = EINA_TRUE;
+ it->wd->selected = eina_list_append(it->wd->selected, it);
call:
- item->walking++;
- 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, SIG_SELECTED, item);
- item->walking--;
- item->wd->walking--;
- item->wd->last_selected_item = item;
- if ((item->wd->clear_me) && (!item->wd->walking))
- elm_gengrid_clear(item->base.widget);
+ it->walking++;
+ it->wd->walking++;
+ if (it->func.func)
+ it->func.func((void *)it->func.data, it->wd->self, it);
+ if (!it->delete_me)
+ evas_object_smart_callback_call(it->wd->self, SIG_SELECTED, it);
+ it->walking--;
+ it->wd->walking--;
+ it->wd->last_selected_item = it;
+ if ((it->wd->clear_me) && (!it->wd->walking))
+ elm_gengrid_clear(WIDGET(it));
else
{
- if ((!item->walking) && (item->delete_me))
- if (!item->relcount) _item_del(item);
+ if ((!it->walking) && (it->delete_me))
+ if (!it->relcount) _item_del(it);
}
}
static void
-_item_unselect(Elm_Gengrid_Item *item)
+_item_unselect(Elm_Gengrid_Item *it)
{
- if ((item->delete_me) || (!item->hilighted)) return;
- edje_object_signal_emit(item->base.view, "elm,state,unselected", "elm");
- item->hilighted = EINA_FALSE;
- if (item->selected)
+ if ((it->delete_me) || (!it->highlighted)) return;
+ edje_object_signal_emit(VIEW(it), "elm,state,unselected", "elm");
+ it->highlighted = EINA_FALSE;
+ if (it->selected)
{
- item->selected = EINA_FALSE;
- item->wd->selected = eina_list_remove(item->wd->selected, item);
- evas_object_smart_callback_call(item->wd->self, SIG_UNSELECTED, item);
+ it->selected = EINA_FALSE;
+ it->wd->selected = eina_list_remove(it->wd->selected, it);
+ evas_object_smart_callback_call(it->wd->self, SIG_UNSELECTED, it);
}
}
{
Widget_Data *wd = data;
Evas_Coord minw = 0, minh = 0, nmax = 0, cvw, cvh;
- int count;
+ Elm_Gengrid_Item *it, *group_item = NULL;
+ int count_group = 0;
+ long count = 0;
+ wd->items_lost = 0;
evas_object_geometry_get(wd->pan_smart, NULL, NULL, &cvw, &cvh);
if ((cvw != 0) || (cvh != 0))
if (nmax < 1)
nmax = 1;
- count = wd->count;
+ EINA_INLIST_FOREACH(wd->items, it)
+ {
+ if (it->prev_group != count_group)
+ it->prev_group = count_group;
+ if (it->is_group)
+ {
+ count = count % nmax;
+ if (count)
+ wd->items_lost += nmax - count;
+ //printf("%d items and I lost %d\n", count, wd->items_lost);
+ count_group++;
+ if (count) count = 0;
+ group_item = it;
+ }
+ else
+ {
+ if (it->parent != group_item)
+ it->parent = group_item;
+ count++;
+ }
+ }
+ count = wd->count + wd->items_lost - count_group;
if (wd->horizontal)
{
- minw = ceil(count / (float)nmax) * wd->item_width;
+ minw = (ceil(count / (float)nmax) * wd->item_width) + (count_group * wd->group_item_width);
minh = nmax * wd->item_height;
}
else
{
minw = nmax * wd->item_width;
- minh = ceil(count / (float)nmax) * wd->item_height;
+ minh = (ceil(count / (float)nmax) * wd->item_height) + (count_group * wd->group_item_height);
}
if ((minw != wd->minw) || (minh != wd->minh))
{
Pan *sd = evas_object_smart_data_get(obj);
Evas_Coord cx = 0, cy = 0;
- Elm_Gengrid_Item *item;
+ Elm_Gengrid_Item *it;
if (!sd) return;
if (!sd->wd->nmax) return;
sd->wd->reorder_item_changed = EINA_FALSE;
- EINA_INLIST_FOREACH(sd->wd->items, item)
+ EINA_INLIST_FOREACH(sd->wd->items, it)
{
- _item_place(item, cx, cy);
+ if (it->is_group)
+ {
+ if (sd->wd->horizontal)
+ {
+ if (cy)
+ {
+ cx++;
+ cy = 0;
+ }
+ }
+ else
+ {
+ if (cx)
+ {
+ cx = 0;
+ cy++;
+ }
+ }
+ }
+ _item_place(it, cx, cy);
if (sd->wd->reorder_item_changed) return;
- if (sd->wd->horizontal)
+ if (it->is_group)
{
- cy = (cy + 1) % sd->wd->nmax;
- if (!cy) cx++;
+ if (sd->wd->horizontal)
+ {
+ cx++;
+ cy = 0;
+ }
+ else
+ {
+ cx = 0;
+ cy++;
+ }
}
else
{
- cx = (cx + 1) % sd->wd->nmax;
- if (!cx) cy++;
+ if (sd->wd->horizontal)
+ {
+ cy = (cy + 1) % sd->wd->nmax;
+ if (!cy) cx++;
+ }
+ else
+ {
+ cx = (cx + 1) % sd->wd->nmax;
+ if (!cx) cy++;
+ }
}
}
+ _group_item_place(sd);
+
if ((sd->wd->reorder_mode) && (sd->wd->reorder_item))
{
}
static void
+_scr_anim_start(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_START, NULL);
+}
+
+static void
+_scr_anim_stop(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_STOP, NULL);
+}
+
+static void
_scr_drag_start(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
}
static void
+_edge_left(void *data,
+ Evas_Object *scr __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ evas_object_smart_callback_call(data, SIG_SCROLL_EDGE_LEFT, NULL);
+ evas_object_smart_callback_call(data, SIG_EDGE_LEFT, NULL);
+}
+
+static void
+_edge_right(void *data,
+ Evas_Object *scr __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ evas_object_smart_callback_call(data, SIG_SCROLL_EDGE_RIGHT, NULL);
+ evas_object_smart_callback_call(data, SIG_EDGE_RIGHT, NULL);
+}
+
+static void
+_edge_top(void *data,
+ Evas_Object *scr __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ evas_object_smart_callback_call(data, SIG_SCROLL_EDGE_TOP, NULL);
+ evas_object_smart_callback_call(data, SIG_EDGE_TOP, NULL);
+}
+
+static void
+_edge_bottom(void *data,
+ Evas_Object *scr __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ evas_object_smart_callback_call(data, SIG_SCROLL_EDGE_BOTTOM, NULL);
+ evas_object_smart_callback_call(data, SIG_EDGE_BOTTOM, NULL);
+}
+
+static void
_scr_scroll(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
static int
_elm_gengrid_item_compare_data(const void *data, const void *data1)
{
- const Elm_Gengrid_Item *item = data;
+ const Elm_Gengrid_Item *it = data;
const Elm_Gengrid_Item *item1 = data1;
- return _elm_gengrid_item_compare_data_cb(item->base.data, item1->base.data);
+ return _elm_gengrid_item_compare_data_cb(it->base.data, item1->base.data);
}
static int
_elm_gengrid_item_compare(const void *data, const void *data1)
{
- Elm_Gengrid_Item *item, *item1;
- item = ELM_GENGRID_ITEM_FROM_INLIST(data);
+ Elm_Gengrid_Item *it, *item1;
+ it = ELM_GENGRID_ITEM_FROM_INLIST(data);
item1 = ELM_GENGRID_ITEM_FROM_INLIST(data1);
- return _elm_gengrid_item_compare_cb(item, item1);
+ return _elm_gengrid_item_compare_cb(it, item1);
}
EAPI Evas_Object *
elm_widget_theme_hook_set(obj, _theme_hook);
elm_widget_signal_emit_hook_set(obj, _signal_emit_hook);
elm_widget_can_focus_set(obj, EINA_TRUE);
+ elm_widget_signal_callback_add_hook_set(obj, _signal_callback_add_hook);
+ elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook);
elm_widget_event_hook_set(obj, _event_hook);
wd->scr = elm_smart_scroller_add(e);
"default");
elm_widget_resize_object_set(obj, wd->scr);
+ evas_object_smart_callback_add(wd->scr, "animate,start", _scr_anim_start, obj);
+ evas_object_smart_callback_add(wd->scr, "animate,stop", _scr_anim_stop, obj);
evas_object_smart_callback_add(wd->scr, "drag,start", _scr_drag_start, obj);
evas_object_smart_callback_add(wd->scr, "drag,stop", _scr_drag_stop, obj);
+ evas_object_smart_callback_add(wd->scr, "edge,left", _edge_left, obj);
+ evas_object_smart_callback_add(wd->scr, "edge,right", _edge_right, obj);
+ evas_object_smart_callback_add(wd->scr, "edge,top", _edge_top, obj);
+ evas_object_smart_callback_add(wd->scr, "edge,bottom", _edge_bottom,
+ obj);
evas_object_smart_callback_add(wd->scr, "scroll", _scr_scroll, obj);
elm_smart_scroller_bounce_allow_set(wd->scr, bounce, bounce);
}
EAPI void
+elm_gengrid_group_item_size_set(Evas_Object *obj,
+ Evas_Coord w,
+ Evas_Coord h)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ if ((wd->group_item_width == w) && (wd->group_item_height == h)) return;
+ wd->group_item_width = w;
+ wd->group_item_height = h;
+ if (wd->calc_job) ecore_job_del(wd->calc_job);
+ wd->calc_job = ecore_job_add(_calc_job, wd);
+}
+
+EAPI void
+elm_gengrid_group_item_size_get(const Evas_Object *obj,
+ Evas_Coord *w,
+ Evas_Coord *h)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ if (w) *w = wd->group_item_width;
+ if (h) *h = wd->group_item_height;
+}
+
+EAPI void
elm_gengrid_align_set(Evas_Object *obj,
double align_x,
double align_y)
EAPI Elm_Gengrid_Item *
elm_gengrid_item_append(Evas_Object *obj,
- const Elm_Gengrid_Item_Class *gic,
+ const Elm_Gengrid_Item_Class *itc,
const void *data,
Evas_Smart_Cb func,
const void *func_data)
{
- Elm_Gengrid_Item *item;
+ Elm_Gengrid_Item *it;
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
- item = _item_create(wd, gic, data, func, func_data);
- if (!item) return NULL;
- wd->items = eina_inlist_append(wd->items, EINA_INLIST_GET(item));
+ it = _item_new(wd, itc, data, func, func_data);
+ if (!it) return NULL;
+ wd->items = eina_inlist_append(wd->items, EINA_INLIST_GET(it));
+
+ if (it->is_group)
+ wd->group_items = eina_list_prepend(wd->group_items, it);
if (wd->calc_job) ecore_job_del(wd->calc_job);
wd->calc_job = ecore_job_add(_calc_job, wd);
- return item;
+ return it;
}
EAPI Elm_Gengrid_Item *
elm_gengrid_item_prepend(Evas_Object *obj,
- const Elm_Gengrid_Item_Class *gic,
+ const Elm_Gengrid_Item_Class *itc,
const void *data,
Evas_Smart_Cb func,
const void *func_data)
{
- Elm_Gengrid_Item *item;
+ Elm_Gengrid_Item *it;
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
- item = _item_create(wd, gic, data, func, func_data);
- if (!item) return NULL;
- wd->items = eina_inlist_prepend(wd->items, EINA_INLIST_GET(item));
+ it = _item_new(wd, itc, data, func, func_data);
+ if (!it) return NULL;
+ wd->items = eina_inlist_prepend(wd->items, EINA_INLIST_GET(it));
+ if (it->is_group)
+ wd->group_items = eina_list_append(wd->group_items, it);
if (wd->calc_job) ecore_job_del(wd->calc_job);
wd->calc_job = ecore_job_add(_calc_job, wd);
- return item;
+ return it;
}
EAPI Elm_Gengrid_Item *
elm_gengrid_item_insert_before(Evas_Object *obj,
- const Elm_Gengrid_Item_Class *gic,
+ const Elm_Gengrid_Item_Class *itc,
const void *data,
Elm_Gengrid_Item *relative,
Evas_Smart_Cb func,
const void *func_data)
{
- Elm_Gengrid_Item *item;
+ Elm_Gengrid_Item *it;
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
EINA_SAFETY_ON_NULL_RETURN_VAL(relative, NULL);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
- item = _item_create(wd, gic, data, func, func_data);
- if (!item) return NULL;
+ it = _item_new(wd, itc, data, func, func_data);
+ if (!it) return NULL;
wd->items = eina_inlist_prepend_relative
- (wd->items, EINA_INLIST_GET(item), EINA_INLIST_GET(relative));
+ (wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET(relative));
+ if (it->is_group)
+ wd->group_items = eina_list_append_relative(wd->group_items, it, relative->parent);
if (wd->calc_job) ecore_job_del(wd->calc_job);
wd->calc_job = ecore_job_add(_calc_job, wd);
- return item;
+ return it;
}
EAPI Elm_Gengrid_Item *
elm_gengrid_item_insert_after(Evas_Object *obj,
- const Elm_Gengrid_Item_Class *gic,
+ const Elm_Gengrid_Item_Class *itc,
const void *data,
Elm_Gengrid_Item *relative,
Evas_Smart_Cb func,
const void *func_data)
{
- Elm_Gengrid_Item *item;
+ Elm_Gengrid_Item *it;
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
EINA_SAFETY_ON_NULL_RETURN_VAL(relative, NULL);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
- item = _item_create(wd, gic, data, func, func_data);
- if (!item) return NULL;
+ it = _item_new(wd, itc, data, func, func_data);
+ if (!it) return NULL;
wd->items = eina_inlist_append_relative
- (wd->items, EINA_INLIST_GET(item), EINA_INLIST_GET(relative));
+ (wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET(relative));
+ if (it->is_group)
+ wd->group_items = eina_list_prepend_relative(wd->group_items, it, relative->parent);
if (wd->calc_job) ecore_job_del(wd->calc_job);
wd->calc_job = ecore_job_add(_calc_job, wd);
- return item;
+ return it;
}
EAPI Elm_Gengrid_Item *
elm_gengrid_item_direct_sorted_insert(Evas_Object *obj,
- const Elm_Gengrid_Item_Class *gic,
+ const Elm_Gengrid_Item_Class *itc,
const void *data,
Eina_Compare_Cb comp,
Evas_Smart_Cb func,
const void *func_data)
{
- Elm_Gengrid_Item *item;
+ Elm_Gengrid_Item *it;
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
- item = _item_create(wd, gic, data, func, func_data);
- if (!item) return NULL;
+ it = _item_new(wd, itc, data, func, func_data);
+ if (!it) return NULL;
+
+ if (!wd->state)
+ wd->state = eina_inlist_sorted_state_new();
_elm_gengrid_item_compare_cb = comp;
- wd->items = eina_inlist_sorted_insert(wd->items, EINA_INLIST_GET(item),
- _elm_gengrid_item_compare);
+ wd->items = eina_inlist_sorted_state_insert(wd->items, EINA_INLIST_GET(it),
+ _elm_gengrid_item_compare, wd->state);
if (wd->calc_job) ecore_job_del(wd->calc_job);
wd->calc_job = ecore_job_add(_calc_job, wd);
- return item;
+ return it;
}
EAPI Elm_Gengrid_Item *
elm_gengrid_item_sorted_insert(Evas_Object *obj,
- const Elm_Gengrid_Item_Class *gic,
+ const Elm_Gengrid_Item_Class *itc,
const void *data,
Eina_Compare_Cb comp,
Evas_Smart_Cb func,
{
_elm_gengrid_item_compare_data_cb = comp;
- return elm_gengrid_item_direct_sorted_insert(obj, gic, data, _elm_gengrid_item_compare_data, func, func_data);
+ return elm_gengrid_item_direct_sorted_insert(obj, itc, data, _elm_gengrid_item_compare_data, func, func_data);
}
EAPI void
-elm_gengrid_item_del(Elm_Gengrid_Item *item)
+elm_gengrid_item_del(Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- if ((item->relcount > 0) || (item->walking > 0))
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ if ((it->relcount > 0) || (it->walking > 0))
{
- item->delete_me = EINA_TRUE;
- elm_widget_item_pre_notify_del(item);
- if (item->selected)
- item->wd->selected = eina_list_remove(item->wd->selected, item);
- if (item->gic->func.del)
- item->gic->func.del((void *)item->base.data, item->wd->self);
+ it->delete_me = EINA_TRUE;
+ elm_widget_item_pre_notify_del(it);
+ if (it->selected)
+ it->wd->selected = eina_list_remove(it->wd->selected, it);
+ if (it->itc->func.del)
+ it->itc->func.del((void *)it->base.data, it->wd->self);
return;
}
- _item_del(item);
+ _item_del(it);
}
EAPI void
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->calc_job)
{
ecore_job_del(wd->calc_job);
if (wd->walking > 0)
{
- Elm_Gengrid_Item *item;
+ Elm_Gengrid_Item *it;
wd->clear_me = 1;
- EINA_INLIST_FOREACH(wd->items, item)
- item->delete_me = 1;
+ EINA_INLIST_FOREACH(wd->items, it)
+ it->delete_me = 1;
return;
}
wd->clear_me = 0;
while (wd->items)
{
- Elm_Gengrid_Item *item = ELM_GENGRID_ITEM_FROM_INLIST(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)
- item->gic->func.del((void *)item->base.data, wd->self);
- if (item->long_timer) ecore_timer_del(item->long_timer);
- elm_widget_item_del(item);
+ elm_widget_item_pre_notify_del(it);
+ if (it->realized) _item_unrealize(it);
+ if (it->itc->func.del)
+ it->itc->func.del((void *)it->base.data, wd->self);
+ if (it->long_timer) ecore_timer_del(it->long_timer);
+ elm_widget_item_del(it);
}
if (wd->selected)
}
EAPI const Evas_Object *
-elm_gengrid_item_object_get(const Elm_Gengrid_Item *item)
+elm_gengrid_item_object_get(const Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- return item->base.view;
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
+ return VIEW(it);
}
EAPI void
-elm_gengrid_item_update(Elm_Gengrid_Item *item)
+elm_gengrid_item_update(Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- if (!item->realized) return;
- if (item->want_unrealize) return;
- _item_unrealize(item);
- _item_realize(item);
- _item_place(item, item->x, item->y);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ if (!it->realized) return;
+ if (it->want_unrealize) return;
+ _item_unrealize(it);
+ _item_realize(it);
+ _item_place(it, it->x, it->y);
}
EAPI void *
-elm_gengrid_item_data_get(const Elm_Gengrid_Item *item)
+elm_gengrid_item_data_get(const Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- return elm_widget_item_data_get(item);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
+ return elm_widget_item_data_get(it);
}
EAPI void
-elm_gengrid_item_data_set(Elm_Gengrid_Item *item,
+elm_gengrid_item_data_set(Elm_Gengrid_Item *it,
const void *data)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- elm_widget_item_data_set(item, data);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ elm_widget_item_data_set(it, data);
}
EAPI const Elm_Gengrid_Item_Class *
-elm_gengrid_item_item_class_get(const Elm_Gengrid_Item *item)
+elm_gengrid_item_item_class_get(const Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- if (item->delete_me) return NULL;
- return item->gic;
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
+ if (it->delete_me) return NULL;
+ return it->itc;
}
EAPI void
-elm_gengrid_item_item_class_set(Elm_Gengrid_Item *item,
- const Elm_Gengrid_Item_Class *gic)
+elm_gengrid_item_item_class_set(Elm_Gengrid_Item *it,
+ const Elm_Gengrid_Item_Class *itc)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- EINA_SAFETY_ON_NULL_RETURN(gic);
- if (item->delete_me) return;
- item->gic = gic;
- elm_gengrid_item_update(item);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ EINA_SAFETY_ON_NULL_RETURN(itc);
+ if (it->delete_me) return;
+ it->itc = itc;
+ elm_gengrid_item_update(it);
}
EAPI void
-elm_gengrid_item_pos_get(const Elm_Gengrid_Item *item,
+elm_gengrid_item_pos_get(const Elm_Gengrid_Item *it,
unsigned int *x,
unsigned int *y)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- if (x) *x = item->x;
- if (y) *y = item->y;
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ if (x) *x = it->x;
+ if (y) *y = it->y;
}
EAPI void
}
EAPI void
-elm_gengrid_item_selected_set(Elm_Gengrid_Item *item,
+elm_gengrid_item_selected_set(Elm_Gengrid_Item *it,
Eina_Bool selected)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- Widget_Data *wd = item->wd;
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ Widget_Data *wd = it->wd;
if (!wd) return;
- if (item->delete_me) return;
+ if (it->delete_me) return;
selected = !!selected;
- if (item->selected == selected) return;
+ if (it->selected == selected) return;
if (selected)
{
while (wd->selected)
_item_unselect(wd->selected->data);
}
- _item_hilight(item);
- _item_select(item);
+ _item_highlight(it);
+ _item_select(it);
}
else
- _item_unselect(item);
+ _item_unselect(it);
}
EAPI Eina_Bool
-elm_gengrid_item_selected_get(const Elm_Gengrid_Item *item)
+elm_gengrid_item_selected_get(const Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
- return item->selected;
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
+ return it->selected;
}
EAPI void
-elm_gengrid_item_disabled_set(Elm_Gengrid_Item *item,
+elm_gengrid_item_disabled_set(Elm_Gengrid_Item *it,
Eina_Bool disabled)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- if (item->disabled == disabled) return;
- if (item->delete_me) return;
- item->disabled = !!disabled;
- if (item->realized)
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ if (it->disabled == disabled) return;
+ if (it->delete_me) return;
+ it->disabled = !!disabled;
+ if (it->realized)
{
- if (item->disabled)
- edje_object_signal_emit(item->base.view, "elm,state,disabled", "elm");
+ if (it->disabled)
+ edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
else
- edje_object_signal_emit(item->base.view, "elm,state,enabled", "elm");
+ edje_object_signal_emit(VIEW(it), "elm,state,enabled", "elm");
}
}
EAPI Eina_Bool
-elm_gengrid_item_disabled_get(const Elm_Gengrid_Item *item)
+elm_gengrid_item_disabled_get(const Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
- if (item->delete_me) return EINA_FALSE;
- return item->disabled;
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
+ if (it->delete_me) return EINA_FALSE;
+ return it->disabled;
}
static Evas_Object *
_elm_gengrid_item_label_create(void *data,
Evas_Object *obj __UNUSED__,
Evas_Object *tooltip,
- void *item __UNUSED__)
+ void *it __UNUSED__)
{
Evas_Object *label = elm_label_add(tooltip);
if (!label)
}
EAPI void
-elm_gengrid_item_tooltip_text_set(Elm_Gengrid_Item *item,
+elm_gengrid_item_tooltip_text_set(Elm_Gengrid_Item *it,
const char *text)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
text = eina_stringshare_add(text);
- elm_gengrid_item_tooltip_content_cb_set(item, _elm_gengrid_item_label_create,
+ elm_gengrid_item_tooltip_content_cb_set(it, _elm_gengrid_item_label_create,
text,
_elm_gengrid_item_label_del_cb);
}
EAPI void
-elm_gengrid_item_tooltip_content_cb_set(Elm_Gengrid_Item *item,
+elm_gengrid_item_tooltip_content_cb_set(Elm_Gengrid_Item *it,
Elm_Tooltip_Item_Content_Cb func,
const void *data,
Evas_Smart_Cb del_cb)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_GOTO(item, error);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_GOTO(it, error);
- if ((item->tooltip.content_cb == func) && (item->tooltip.data == data))
+ if ((it->tooltip.content_cb == func) && (it->tooltip.data == data))
return;
- if (item->tooltip.del_cb)
- item->tooltip.del_cb((void *)item->tooltip.data,
- item->base.widget, item);
- item->tooltip.content_cb = func;
- item->tooltip.data = data;
- item->tooltip.del_cb = del_cb;
- if (item->base.view)
+ if (it->tooltip.del_cb)
+ it->tooltip.del_cb((void *)it->tooltip.data,
+ WIDGET(it), it);
+ it->tooltip.content_cb = func;
+ it->tooltip.data = data;
+ it->tooltip.del_cb = del_cb;
+ if (VIEW(it))
{
- elm_widget_item_tooltip_content_cb_set(item,
- item->tooltip.content_cb,
- item->tooltip.data, NULL);
- elm_widget_item_tooltip_style_set(item, item->tooltip.style);
- elm_widget_item_tooltip_size_restrict_disable(item, item->tooltip.free_size);
+ elm_widget_item_tooltip_content_cb_set(it,
+ it->tooltip.content_cb,
+ it->tooltip.data, NULL);
+ elm_widget_item_tooltip_style_set(it, it->tooltip.style);
+ elm_widget_item_tooltip_size_restrict_disable(it, it->tooltip.free_size);
}
return;
}
EAPI void
-elm_gengrid_item_tooltip_unset(Elm_Gengrid_Item *item)
+elm_gengrid_item_tooltip_unset(Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- if ((item->base.view) && (item->tooltip.content_cb))
- elm_widget_item_tooltip_unset(item);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ if ((VIEW(it)) && (it->tooltip.content_cb))
+ elm_widget_item_tooltip_unset(it);
- if (item->tooltip.del_cb)
- item->tooltip.del_cb((void *)item->tooltip.data, item->base.widget, item);
- item->tooltip.del_cb = NULL;
- item->tooltip.content_cb = NULL;
- item->tooltip.data = NULL;
- item->tooltip.free_size = EINA_FALSE;
- if (item->tooltip.style)
- elm_gengrid_item_tooltip_style_set(item, NULL);
+ if (it->tooltip.del_cb)
+ it->tooltip.del_cb((void *)it->tooltip.data, WIDGET(it), it);
+ it->tooltip.del_cb = NULL;
+ it->tooltip.content_cb = NULL;
+ it->tooltip.data = NULL;
+ it->tooltip.free_size = EINA_FALSE;
+ if (it->tooltip.style)
+ elm_gengrid_item_tooltip_style_set(it, NULL);
}
EAPI void
-elm_gengrid_item_tooltip_style_set(Elm_Gengrid_Item *item,
+elm_gengrid_item_tooltip_style_set(Elm_Gengrid_Item *it,
const char *style)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- eina_stringshare_replace(&item->tooltip.style, style);
- if (item->base.view) elm_widget_item_tooltip_style_set(item, style);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ eina_stringshare_replace(&it->tooltip.style, style);
+ if (VIEW(it)) elm_widget_item_tooltip_style_set(it, style);
}
EAPI const char *
-elm_gengrid_item_tooltip_style_get(const Elm_Gengrid_Item *item)
+elm_gengrid_item_tooltip_style_get(const Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- return item->tooltip.style;
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
+ return it->tooltip.style;
}
EAPI Eina_Bool
-elm_gengrid_item_tooltip_size_restrict_disable(Elm_Gengrid_Item *item, Eina_Bool disable)
+elm_gengrid_item_tooltip_size_restrict_disable(Elm_Gengrid_Item *it, Eina_Bool disable)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
- item->tooltip.free_size = disable;
- if (item->base.view) return elm_widget_item_tooltip_size_restrict_disable(item, disable);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
+ it->tooltip.free_size = disable;
+ if (VIEW(it)) return elm_widget_item_tooltip_size_restrict_disable(it, disable);
return EINA_TRUE;
}
EAPI Eina_Bool
-elm_gengrid_item_tooltip_size_restrict_disabled_get(const Elm_Gengrid_Item *item)
+elm_gengrid_item_tooltip_size_restrict_disabled_get(const Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
- return item->tooltip.free_size;
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
+ return it->tooltip.free_size;
}
EAPI void
-elm_gengrid_item_cursor_set(Elm_Gengrid_Item *item,
+elm_gengrid_item_cursor_set(Elm_Gengrid_Item *it,
const char *cursor)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- eina_stringshare_replace(&item->mouse_cursor, cursor);
- if (item->base.view) elm_widget_item_cursor_set(item, cursor);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ eina_stringshare_replace(&it->mouse_cursor, cursor);
+ if (VIEW(it)) elm_widget_item_cursor_set(it, cursor);
}
EAPI const char *
-elm_gengrid_item_cursor_get(const Elm_Gengrid_Item *item)
+elm_gengrid_item_cursor_get(const Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- return elm_widget_item_cursor_get(item);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
+ return elm_widget_item_cursor_get(it);
}
EAPI void
-elm_gengrid_item_cursor_unset(Elm_Gengrid_Item *item)
+elm_gengrid_item_cursor_unset(Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- if (!item->mouse_cursor)
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ if (!it->mouse_cursor)
return;
- if (item->base.view)
- elm_widget_item_cursor_unset(item);
+ if (VIEW(it))
+ elm_widget_item_cursor_unset(it);
- eina_stringshare_del(item->mouse_cursor);
- item->mouse_cursor = NULL;
+ eina_stringshare_del(it->mouse_cursor);
+ it->mouse_cursor = NULL;
}
EAPI void
-elm_gengrid_item_cursor_style_set(Elm_Gengrid_Item *item,
+elm_gengrid_item_cursor_style_set(Elm_Gengrid_Item *it,
const char *style)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- elm_widget_item_cursor_style_set(item, style);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ elm_widget_item_cursor_style_set(it, style);
}
EAPI const char *
-elm_gengrid_item_cursor_style_get(const Elm_Gengrid_Item *item)
+elm_gengrid_item_cursor_style_get(const Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- return elm_widget_item_cursor_style_get(item);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
+ return elm_widget_item_cursor_style_get(it);
}
EAPI void
-elm_gengrid_item_cursor_engine_only_set(Elm_Gengrid_Item *item,
+elm_gengrid_item_cursor_engine_only_set(Elm_Gengrid_Item *it,
Eina_Bool engine_only)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- elm_widget_item_cursor_engine_only_set(item, engine_only);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ elm_widget_item_cursor_engine_only_set(it, engine_only);
}
EAPI Eina_Bool
-elm_gengrid_item_cursor_engine_only_get(const Elm_Gengrid_Item *item)
+elm_gengrid_item_cursor_engine_only_get(const Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
- return elm_widget_item_cursor_engine_only_get(item);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
+ return elm_widget_item_cursor_engine_only_get(it);
}
EAPI void
v_pagesize);
}
+EAPI void
+elm_gengrid_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ if (wd->scr)
+ elm_smart_scroller_current_page_get(wd->scr, h_pagenumber, v_pagenumber);
+}
+
+EAPI void
+elm_gengrid_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ if (wd->scr)
+ elm_smart_scroller_last_page_get(wd->scr, h_pagenumber, v_pagenumber);
+}
+
+EAPI void
+elm_gengrid_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ if (wd->scr)
+ elm_smart_scroller_page_show(wd->scr, h_pagenumber, v_pagenumber);
+}
+
+EAPI void
+elm_gengrid_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenumber)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ if (wd->scr)
+ elm_smart_scroller_page_bring_in(wd->scr, h_pagenumber, v_pagenumber);
+}
+
EAPI Elm_Gengrid_Item *
elm_gengrid_first_item_get(const Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
if (!wd->items) return NULL;
- Elm_Gengrid_Item *item = ELM_GENGRID_ITEM_FROM_INLIST(wd->items);
- while ((item) && (item->delete_me))
- item = ELM_GENGRID_ITEM_FROM_INLIST(EINA_INLIST_GET(item)->next);
- return item;
+ 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;
}
EAPI Elm_Gengrid_Item *
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
if (!wd->items) return NULL;
- Elm_Gengrid_Item *item = ELM_GENGRID_ITEM_FROM_INLIST(wd->items->last);
- while ((item) && (item->delete_me))
- item = ELM_GENGRID_ITEM_FROM_INLIST(EINA_INLIST_GET(item)->prev);
- return item;
+ Elm_Gengrid_Item *it = ELM_GENGRID_ITEM_FROM_INLIST(wd->items->last);
+ while ((it) && (it->delete_me))
+ it = ELM_GENGRID_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
+ return it;
}
EAPI Elm_Gengrid_Item *
-elm_gengrid_item_next_get(const Elm_Gengrid_Item *item)
+elm_gengrid_item_next_get(const Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- while (item)
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
+ while (it)
{
- item = ELM_GENGRID_ITEM_FROM_INLIST(EINA_INLIST_GET(item)->next);
- if ((item) && (!item->delete_me)) break;
+ it = ELM_GENGRID_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
+ if ((it) && (!it->delete_me)) break;
}
- return (Elm_Gengrid_Item *)item;
+ return (Elm_Gengrid_Item *)it;
}
EAPI Elm_Gengrid_Item *
-elm_gengrid_item_prev_get(const Elm_Gengrid_Item *item)
+elm_gengrid_item_prev_get(const Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- while (item)
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
+ while (it)
{
- item = ELM_GENGRID_ITEM_FROM_INLIST(EINA_INLIST_GET(item)->prev);
- if ((item) && (!item->delete_me)) break;
+ it = ELM_GENGRID_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
+ if ((it) && (!it->delete_me)) break;
}
- return (Elm_Gengrid_Item *)item;
+ return (Elm_Gengrid_Item *)it;
}
EAPI Evas_Object *
-elm_gengrid_item_gengrid_get(const Elm_Gengrid_Item *item)
+elm_gengrid_item_gengrid_get(const Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- return item->base.widget;
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
+ return WIDGET(it);
}
EAPI void
-elm_gengrid_item_show(Elm_Gengrid_Item *item)
+elm_gengrid_item_show(Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- Widget_Data *wd = elm_widget_data_get(item->wd->self);
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ Widget_Data *wd = elm_widget_data_get(it->wd->self);
Evas_Coord minx = 0, miny = 0;
if (!wd) return;
- if ((!item) || (item->delete_me)) return;
+ if ((!it) || (it->delete_me)) return;
_pan_min_get(wd->pan_smart, &minx, &miny);
- elm_smart_scroller_child_region_show(item->wd->scr,
- item->x * wd->item_width + minx,
- item->y * wd->item_height + miny,
- item->wd->item_width,
- item->wd->item_height);
+ if (wd->horizontal)
+ elm_smart_scroller_region_bring_in(it->wd->scr,
+ ((it->x - it->prev_group) * wd->item_width) + (it->prev_group * it->wd->group_item_width) + minx,
+ it->y * wd->item_height + miny,
+ it->wd->item_width,
+ it->wd->item_height);
+ else
+ elm_smart_scroller_region_bring_in(it->wd->scr,
+ it->x * wd->item_width + minx,
+ ((it->y - it->prev_group)* wd->item_height) + (it->prev_group * it->wd->group_item_height) + miny,
+ it->wd->item_width,
+ it->wd->item_height);
}
EAPI void
-elm_gengrid_item_bring_in(Elm_Gengrid_Item *item)
+elm_gengrid_item_bring_in(Elm_Gengrid_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- if (item->delete_me) return;
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ if (it->delete_me) return;
Evas_Coord minx = 0, miny = 0;
- Widget_Data *wd = elm_widget_data_get(item->wd->self);
+ Widget_Data *wd = elm_widget_data_get(it->wd->self);
if (!wd) return;
_pan_min_get(wd->pan_smart, &minx, &miny);
- elm_smart_scroller_region_bring_in(item->wd->scr,
- item->x * wd->item_width + minx,
- item->y * wd->item_height + miny,
- item->wd->item_width,
- item->wd->item_height);
+ if (wd->horizontal)
+ elm_smart_scroller_region_bring_in(it->wd->scr,
+ ((it->x - it->prev_group) * wd->item_width) + (it->prev_group * it->wd->group_item_width) + minx,
+ it->y * wd->item_height + miny,
+ it->wd->item_width,
+ it->wd->item_height);
+ else
+ elm_smart_scroller_region_bring_in(it->wd->scr,
+ it->x * wd->item_width + minx,
+ ((it->y - it->prev_group)* wd->item_height) + (it->prev_group * it->wd->group_item_height) + miny,
+ it->wd->item_width,
+ it->wd->item_height);
}