#include <assert.h>
+#include <fnmatch.h>
#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
Eina_Bool swipe : 1;
Eina_Bool reorder_mode : 1;
Eina_Bool reorder_pan_move : 1;
- Eina_List *dragging_queue;
struct
{
Evas_Coord x, y;
Eina_Bool effect_mode : 1;
Eina_Bool auto_scrolled : 1;
Eina_Bool pan_changed : 1;
+ Eina_Bool drag_started : 1;
int edit_mode;
Ecore_Animator *item_moving_effect_timer;
Evas_Object *alpha_bg;
Eina_Bool before : 1;
Eina_Bool want_unrealize : 1;
- Eina_Bool want_realize : 1;
Eina_Bool realized : 1;
Eina_Bool selected : 1;
Eina_Bool highlighted : 1;
Eina_Bool nocache : 1;
Eina_Bool move_effect_enabled : 1;
Eina_Bool defer_unrealize : 1;
+ Eina_Bool can_focus : 1;
+ Eina_Bool no_select : 1;
+
// TODO: refactoring
Eina_Bool effect_done : 1;
static void _mode_item_unrealize(Elm_Genlist_Item *it);
static void _item_mode_set(Elm_Genlist_Item *it);
static void _item_mode_unset(Widget_Data *wd);
-static void _group_items_recalc(void *data);
static void _item_move_after(Elm_Genlist_Item *it,
Elm_Genlist_Item *after);
static void _item_move_before(Elm_Genlist_Item *it,
static const char SIG_DRAG_STOP[] = "drag,stop";
static const char SIG_DRAG[] = "drag";
static const char SIG_LONGPRESSED[] = "longpressed";
+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";
static const char SIG_SCROLL_EDGE_BOTTOM[] = "scroll,edge,bottom";
static const char SIG_SCROLL_EDGE_LEFT[] = "scroll,edge,left";
{SIG_DRAG_STOP, ""},
{SIG_DRAG, ""},
{SIG_LONGPRESSED, ""},
+ {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, ""},
it = elm_genlist_selected_item_get(obj);
elm_genlist_item_expanded_set(it,
!elm_genlist_item_expanded_get(it));
- evas_object_smart_callback_call(it->base.widget, SIG_ACTIVATED, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, it);
}
else if (!strcmp(ev->keyname, "Escape"))
{
{
elm_object_signal_emit(wd->obj, "elm,action,focus", "elm");
evas_object_focus_set(wd->obj, EINA_TRUE);
- if ((wd->selected) && (!wd->last_selected_item))
+ if ((wd->items) && (wd->selected) && (!wd->last_selected_item))
wd->last_selected_item = eina_list_data_get(wd->selected);
}
else
//x & y are screen coordinates, Add with pan coordinates
x += wd->pan_x;
y += wd->pan_y;
- if(wd->rename_it) elm_genlist_item_bring_in(wd->rename_it);
- else elm_smart_scroller_child_region_show(wd->scr, x, y, w, h);
+ elm_smart_scroller_child_region_show(wd->scr, x, y, w, h);
+}
+
+static void
+_translate_hook(Evas_Object *obj)
+{
+ evas_object_smart_callback_call(obj, "language,changed", NULL);
}
static void
}
if (wd->mode == ELM_LIST_LIMIT)
{
- Evas_Coord vmw, vmh, vw, vh;
+ Evas_Coord vmw, vmh;
minw = wd->realminw;
maxw = -1;
- elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh);
- if ((minw > 0) && (vw < minw)) vw = minw;
- else if ((maxw > 0) && (vw > maxw))
- vw = maxw;
+ elm_smart_scroller_child_viewport_size_get(wd->scr, &vmw, &vmh);
edje_object_size_min_calc
(elm_smart_scroller_edje_object_get(wd->scr), &vmw, &vmh);
minw = vmw + minw;
_item_highlight(Elm_Genlist_Item *it)
{
const char *selectraise;
- if ((it->wd->no_select) || (it->delete_me) || (it->highlighted) ||
- (it->disabled) || (it->display_only) || (it->mode_view))
+ if ((it->wd->no_select) || (it->no_select) || (it->delete_me) || (it->highlighted) ||
+ (it->disabled) || (it->display_only))
return;
- edje_object_signal_emit(it->base.view, "elm,state,selected", "elm");
+ edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
if (it->edit_obj) edje_object_signal_emit(it->edit_obj, "elm,state,selected", "elm");
- selectraise = edje_object_data_get(it->base.view, "selectraise");
+ selectraise = edje_object_data_get(VIEW(it), "selectraise");
if ((selectraise) && (!strcmp(selectraise, "on")))
{
if (it->edit_obj) evas_object_raise(it->edit_obj);
- else evas_object_raise(it->base.view);
+ else evas_object_raise(VIEW(it));
if ((it->group_item) && (it->group_item->realized))
- evas_object_raise(it->group_item->base.view);
+ evas_object_raise(it->VIEW(group_item));
}
it->highlighted = EINA_TRUE;
}
elm_genlist_item_subitems_clear(it);
it->wd->walking -= it->walking;
if (it->wd->show_item == it) it->wd->show_item = NULL;
- if (it->selected) it->wd->selected = eina_list_remove(it->wd->selected, it);
if (it->realized) _item_unrealize(it, EINA_FALSE);
if (it->effect_item_realized) _effect_item_unrealize(it);
if (it->block) _item_block_del(it);
if ((!it->delete_me) && (it->itc->func.del))
- it->itc->func.del((void *)it->base.data, it->base.widget);
+ it->itc->func.del((void *)it->base.data, WIDGET(it));
it->delete_me = EINA_TRUE;
if (it->queued)
it->wd->queue = eina_list_remove(it->wd->queue, it);
if (it->swipe_timer) ecore_timer_del(it->swipe_timer);
if (it->tooltip.del_cb)
- it->tooltip.del_cb((void *)it->tooltip.data, it->base.widget, it);
+ it->tooltip.del_cb((void *)it->tooltip.data, WIDGET(it), it);
evas_event_thaw(evas_object_evas_get(tob));
evas_event_thaw_eval(evas_object_evas_get(tob));
{
Eina_List *l;
Evas_Object *obj;
- Evas_Object *parent = it->base.widget;
- if ((it->wd->no_select) || (it->delete_me) || (it->mode_view)) return;
+ Evas_Object *parent = WIDGET(it);
+
+ if ((it->wd->no_select) || (it->no_select) || (it->delete_me)) return;
if (it->selected)
{
if (it->wd->always_select) goto call;
if (it->wd->last_selected_item && (it != it->wd->last_selected_item))
{
EINA_LIST_FOREACH(it->wd->last_selected_item->icon_objs, l, obj)
- elm_widget_focused_object_clear(obj);
+ {
+ elm_widget_focused_object_clear(obj);
+ elm_widget_tree_unfocusable_set(obj, EINA_TRUE);
+ }
+ it->wd->last_selected_item->can_focus = EINA_FALSE;
}
if (it->func.func) it->func.func((void *)it->func.data, parent, it);
if (!it->delete_me)
{
const char *stacking, *selectraise;
- if ((it->delete_me) || (!it->highlighted)) return;
- edje_object_signal_emit(it->base.view, "elm,state,unselected", "elm");
+ if ((it->delete_me) || ((!it->highlighted) && (!it->selected))) return;
+ edje_object_signal_emit(VIEW(it), "elm,state,unselected", "elm");
if (it->edit_obj) edje_object_signal_emit(it->edit_obj, "elm,state,unselected", "elm");
- stacking = edje_object_data_get(it->base.view, "stacking");
- selectraise = edje_object_data_get(it->base.view, "selectraise");
+ stacking = edje_object_data_get(VIEW(it), "stacking");
+ selectraise = edje_object_data_get(VIEW(it), "selectraise");
if ((selectraise) && (!strcmp(selectraise, "on")))
{
if ((stacking) && (!strcmp(stacking, "below")))
- evas_object_lower(it->base.view);
+ evas_object_lower(VIEW(it));
}
it->highlighted = EINA_FALSE;
if (it->selected)
{
it->selected = EINA_FALSE;
it->wd->selected = eina_list_remove(it->wd->selected, it);
- evas_object_smart_callback_call(it->base.widget, SIG_UNSELECTED, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_UNSELECTED, it);
}
}
if (!it->wd->on_hold)
{
it->wd->on_hold = EINA_TRUE;
- if (!it->wd->wasselected)
+ if ((!it->wd->wasselected) && (!it->renamed))
_item_unselect(it);
}
}
ecore_timer_del(it->long_timer);
it->long_timer = NULL;
}
- evas_object_smart_callback_call(it->base.widget, SIG_DRAG, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_DRAG, it);
return;
}
if ((!it->down) /* || (it->wd->on_hold)*/ || (it->wd->longpressed))
if (it->edit_obj)
_item_position(it, it->edit_obj, it->scrl_x, y_pos);
else
- _item_position(it, it->base.view, it->scrl_x, y_pos);
+ _item_position(it, VIEW(it), it->scrl_x, y_pos);
+
if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
}
if ((adx > minw) || (ady > minh))
{
it->dragging = EINA_TRUE;
- it->wd->dragging_queue = eina_list_append(it->wd->dragging_queue, it);
if (it->long_timer)
{
ecore_timer_del(it->long_timer);
it->long_timer = NULL;
}
- if (!it->wd->wasselected)
+ if ((!it->wd->wasselected) && (!it->renamed))
_item_unselect(it);
if (dy < 0)
{
- if (ady > adx)
- evas_object_smart_callback_call(it->base.widget,
+ if ((ady > adx) && (!it->wd->drag_started))
+ evas_object_smart_callback_call(WIDGET(it),
SIG_DRAG_START_UP, it);
else
{
if (dx < 0)
- evas_object_smart_callback_call(it->base.widget,
+ evas_object_smart_callback_call(WIDGET(it),
SIG_DRAG_START_LEFT, it);
else
- evas_object_smart_callback_call(it->base.widget,
+ evas_object_smart_callback_call(WIDGET(it),
SIG_DRAG_START_RIGHT, it);
}
}
else
{
- if (ady > adx)
- evas_object_smart_callback_call(it->base.widget,
+ if ((ady > adx) && (!it->wd->drag_started))
+ evas_object_smart_callback_call(WIDGET(it),
SIG_DRAG_START_DOWN, it);
else
{
if (dx < 0)
- evas_object_smart_callback_call(it->base.widget,
+ evas_object_smart_callback_call(WIDGET(it),
SIG_DRAG_START_LEFT, it);
else
- evas_object_smart_callback_call(it->base.widget,
+ evas_object_smart_callback_call(WIDGET(it),
SIG_DRAG_START_RIGHT, it);
}
}
if ((it->disabled) || (it->dragging) || (it->display_only) || (it->wd->rename_it))
return ECORE_CALLBACK_CANCEL;
it->wd->longpressed = EINA_TRUE;
- evas_object_smart_callback_call(it->base.widget, SIG_LONGPRESSED, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, it);
if ((it->wd->reorder_mode) && (it->flags != ELM_GENLIST_ITEM_GROUP))
{
it->wd->reorder_it = it;
if (it->edit_obj)
evas_object_raise(it->edit_obj);
else
- evas_object_raise(it->base.view);
+ 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);
if (it->edit_obj)
edje_object_signal_emit(it->edit_obj, "elm,action,item,reorder_start", "elm");
else
- edje_object_signal_emit(it->base.view, "elm,state,reorder,enabled", "elm");
+ edje_object_signal_emit(VIEW(it), "elm,state,reorder,enabled", "elm");
}
return ECORE_CALLBACK_CANCEL;
}
sum /= it->wd->movements;
if (abs(sum - it->wd->history[0].x) <= 10) return;
- evas_object_smart_callback_call(it->base.widget, SIG_SWIPE, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_SWIPE, it);
}
static Eina_Bool
if ((off_x + off_mx) > (off_y + off_my))
{
if ((it->wd->cur_x > it->wd->prev_x) && (it->wd->cur_mx > it->wd->prev_mx))
- evas_object_smart_callback_call(it->base.widget,
+ evas_object_smart_callback_call(WIDGET(it),
SIG_MULTI_SWIPE_RIGHT, it);
else if ((it->wd->cur_x < it->wd->prev_x) && (it->wd->cur_mx < it->wd->prev_mx))
- evas_object_smart_callback_call(it->base.widget,
+ evas_object_smart_callback_call(WIDGET(it),
SIG_MULTI_SWIPE_LEFT, it);
else if (abs(it->wd->cur_x - it->wd->cur_mx) > abs(it->wd->prev_x - it->wd->prev_mx))
- evas_object_smart_callback_call(it->base.widget,
+ evas_object_smart_callback_call(WIDGET(it),
SIG_MULTI_PINCH_OUT, it);
else
- evas_object_smart_callback_call(it->base.widget,
+ evas_object_smart_callback_call(WIDGET(it),
SIG_MULTI_PINCH_IN, it);
}
else
{
if ((it->wd->cur_y > it->wd->prev_y) && (it->wd->cur_my > it->wd->prev_my))
- evas_object_smart_callback_call(it->base.widget,
+ evas_object_smart_callback_call(WIDGET(it),
SIG_MULTI_SWIPE_DOWN, it);
else if ((it->wd->cur_y < it->wd->prev_y) && (it->wd->cur_my < it->wd->prev_my))
- evas_object_smart_callback_call(it->base.widget,
+ evas_object_smart_callback_call(WIDGET(it),
SIG_MULTI_SWIPE_UP, it);
else if (abs(it->wd->cur_y - it->wd->cur_my) > abs(it->wd->prev_y - it->wd->prev_my))
- evas_object_smart_callback_call(it->base.widget,
+ evas_object_smart_callback_call(WIDGET(it),
SIG_MULTI_PINCH_OUT, it);
else
- evas_object_smart_callback_call(it->base.widget,
+ evas_object_smart_callback_call(WIDGET(it),
SIG_MULTI_PINCH_IN, it);
}
}
if (it->dragging)
{
it->dragging = EINA_FALSE;
- evas_object_smart_callback_call(it->base.widget, SIG_DRAG_STOP, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_DRAG_STOP, it);
}
if (it->swipe_timer)
{
Elm_Genlist_Item *it = data;
Evas_Event_Mouse_Down *ev = event_info;
Evas_Coord x, y;
+ Eina_List *l;
+ Evas_Object *iobj;
if (ev->button != 1) return;
+ if (!it->can_focus)
+ {
+ EINA_LIST_FOREACH(it->icon_objs, l, iobj)
+ {
+ elm_widget_tree_unfocusable_set(iobj, EINA_FALSE);
+ }
+ it->can_focus = EINA_TRUE;
+ }
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
{
it->wd->on_hold = EINA_TRUE;
if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
if ((!it->disabled) && (!it->display_only))
{
- evas_object_smart_callback_call(it->base.widget, SIG_CLICKED_DOUBLE, it);
- evas_object_smart_callback_call(it->base.widget, SIG_ACTIVATED, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED_DOUBLE, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, it);
}
if (it->long_timer) ecore_timer_del(it->long_timer);
if (it->swipe_timer) ecore_timer_del(it->swipe_timer);
ecore_timer_del(it->long_timer);
it->long_timer = NULL;
}
- while (it->wd->dragging_queue)
+ if (it->dragging)
{
- Elm_Genlist_Item *dragging_it = NULL;
- dragging_it = eina_list_data_get(it->wd->dragging_queue);
- dragging_it->dragging = EINA_FALSE;
- evas_object_smart_callback_call(dragging_it->base.widget, SIG_DRAG_STOP, dragging_it);
- if (dragging_it->want_unrealize)
- {
- _item_unrealize(dragging_it, EINA_FALSE);
- if (dragging_it->block->want_unrealize)
- _item_block_unrealize(it->block);
- }
- it->wd->dragging_queue = eina_list_remove_list(it->wd->dragging_queue,it->wd->dragging_queue);
+ it->dragging = EINA_FALSE;
+ evas_object_smart_callback_call(WIDGET(it), SIG_DRAG_STOP, it);
dragged = 1;
}
if (it->swipe_timer)
if (it->wd->longpressed)
{
it->wd->longpressed = EINA_FALSE;
- if (!it->wd->wasselected)
+ if ((!it->wd->wasselected) && (!it->renamed))
_item_unselect(it);
it->wd->wasselected = EINA_FALSE;
return;
}
+ if (dragged)
+ {
+ if (it->want_unrealize)
+ {
+ _item_unrealize(it, EINA_FALSE);
+ if (it->block->want_unrealize)
+ _item_block_unrealize(it->block);
+ }
+ }
if ((it->disabled) || (dragged) || (it->display_only)) return;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
if (it->wd->multi)
}
static void
+_mouse_down_scroller(void *data,
+ Evas *evas __UNUSED__,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ Widget_Data *wd = elm_widget_data_get(data);
+
+ if (!wd) return;
+ wd->drag_started = EINA_FALSE;
+}
+
+static void
+_mouse_up_scroller(void *data,
+ Evas *evas __UNUSED__,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ Widget_Data *wd = elm_widget_data_get(data);
+
+ if (!wd) return;
+ wd->drag_started = EINA_FALSE;
+}
+
+static void
+_mouse_move_scroller(void *data,
+ Evas *evas __UNUSED__,
+ Evas_Object *obj __UNUSED__,
+ void *event_info)
+{
+ Widget_Data *wd = elm_widget_data_get(data);
+ Evas_Event_Mouse_Move *ev = event_info;
+ Evas_Coord minw = 0, minh = 0, dx, dy, adx, ady;
+
+ if (!wd) return;
+ if (wd->drag_started) return;
+
+ elm_coords_finger_size_adjust(1, &minw, 1, &minh);
+ dx = ev->cur.canvas.x - ev->prev.canvas.x;
+ dy = ev->cur.canvas.y - ev->prev.canvas.y;
+ adx = dx;
+ ady = dy;
+ if (adx < 0) adx = -dx;
+ if (ady < 0) ady = -dy;
+ if (((ady < minh) && (ady > minh / 2)) && (ady > adx))
+ {
+ if (dy < 0)
+ {
+ evas_object_smart_callback_call(data, SIG_DRAG_START_UP, NULL);
+ wd->drag_started = EINA_TRUE;
+ }
+ else
+ {
+ evas_object_smart_callback_call(data, SIG_DRAG_START_DOWN, NULL);
+ wd->drag_started = EINA_TRUE;
+ }
+ }
+}
+
+static void
_signal_expand_toggle(void *data,
Evas_Object *obj __UNUSED__,
const char *emission __UNUSED__,
Elm_Genlist_Item *it = data;
if (it->expanded)
- evas_object_smart_callback_call(it->base.widget, SIG_CONTRACT_REQUEST, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_CONTRACT_REQUEST, it);
else
- evas_object_smart_callback_call(it->base.widget, SIG_EXPAND_REQUEST, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_EXPAND_REQUEST, it);
}
static void
Elm_Genlist_Item *it = data;
if (!it->expanded)
- evas_object_smart_callback_call(it->base.widget, SIG_EXPAND_REQUEST, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_EXPAND_REQUEST, it);
}
static void
Elm_Genlist_Item *it = data;
if (it->expanded)
- evas_object_smart_callback_call(it->base.widget, SIG_CONTRACT_REQUEST, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_CONTRACT_REQUEST, it);
}
static Eina_Bool
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);
evas_event_freeze(evas_object_evas_get(it->wd->obj));
if (it->wd->item_cache_max <= 0)
{
- evas_object_del(it->base.view);
- it->base.view = NULL;
+ evas_object_del(VIEW(it));
+ VIEW(it) = NULL;
evas_object_del(it->spacer);
it->spacer = NULL;
evas_event_thaw(evas_object_evas_get(it->wd->obj));
EINA_INLIST_GET(itc));
itc->spacer = it->spacer;
it->spacer = NULL;
- itc->base_view = it->base.view;
- it->base.view = NULL;
+ itc->base_view = VIEW(it);
+ VIEW(it) = NULL;
evas_object_hide(itc->base_view);
evas_object_move(itc->base_view, -9999, -9999);
itc->item_style = eina_stringshare_add(it->itc->item_style);
_item_label_hook(Elm_Genlist_Item *it, const char *part)
{
if (!it->itc->func.label_get) return NULL;
- return edje_object_part_text_get(it->base.view, part);
+ return edje_object_part_text_get(VIEW(it), part);
}
static void
}
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->selected) it->wd->selected = eina_list_remove(it->wd->selected, it);
+ 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)
+ Eina_List **source,
+ const char *parts)
{
if (it->itc->func.label_get)
{
*source = elm_widget_stringlist_get(edje_object_data_get(target, "labels"));
EINA_LIST_FOREACH(*source, l, key)
{
+ if (parts && fnmatch(parts, key, FNM_PERIOD))
+ continue;
+
char *s = it->itc->func.label_get
- ((void *)it->base.data, it->base.widget, key);
+ ((void *)it->base.data, WIDGET(it), key);
if (s)
{
{
edje_object_part_text_set(target, key, "");
}
+
+ }
+ }
+}
+
+static Eina_List *
+_item_mode_icon_unrealize(Elm_Genlist_Item *it,
+ Evas_Object *target,
+ Eina_List **source,
+ const char *parts,
+ Eina_List **icons_list)
+{
+ Eina_List *res = *icons_list;
+
+ if (it->itc->func.icon_get)
+ {
+ const Eina_List *l;
+ const char *key;
+ Evas_Object *ic = NULL;
+
+ EINA_LIST_FOREACH(*source, l, key)
+ {
+ if (parts && fnmatch(parts, key, FNM_PERIOD))
+ continue;
+
+ ic = edje_object_part_swallow_get(target, key);
+ if (ic)
+ {
+ res = eina_list_remove(res, ic);
+ edje_object_part_unswallow(target, ic);
+ evas_object_del(ic);
+ }
+ }
+ }
+
+ return res;
+}
+
+static Eina_List *
+_item_mode_icon_realize(Elm_Genlist_Item *it,
+ Evas_Object *target,
+ Eina_List **source,
+ const char *parts,
+ Eina_List **icons_list,
+ const char *icons_part)
+
+{
+ Eina_List *res = NULL;
+
+ if (it->itc->func.icon_get)
+ {
+ const Eina_List *l;
+ const char *key;
+
+ *source = elm_widget_stringlist_get(edje_object_data_get(target, icons_part));
+ if (parts && (eina_list_count(*source) != eina_list_count(*icons_list)))
+ res = *icons_list;
+ EINA_LIST_FOREACH(*source, l, key)
+ {
+ if (parts && fnmatch(parts, key, FNM_PERIOD))
+ continue;
+
+ Evas_Object *ic = it->itc->func.icon_get
+ ((void *)it->base.data, WIDGET(it), l->data);
+
+ if (ic)
+ {
+ res = eina_list_append(res, ic);
+ edje_object_part_swallow(target, key, ic);
+ evas_object_show(ic);
+ elm_widget_sub_object_add(WIDGET(it), ic);
+ if (it->mode_view || it->wd->edit_mode)
+ {
+ if (it->disabled)
+ elm_widget_disabled_set(ic, EINA_TRUE);
+ }
+ else if (it->renamed)
+ {
+ // FIXME: if entry calcuates its cursor position correctly and conformant works,
+ // genlist does not need to handle this focus thing.
+ evas_object_smart_callback_add(ic, "focused", _icon_focused, it);
+ evas_object_smart_callback_add(ic, "unfocused", _icon_unfocused, it);
+ }
+ }
}
}
+
+ return res;
+}
+
+static Eina_List *
+_item_icon_unrealize(Elm_Genlist_Item *it,
+ Evas_Object *target,
+ Eina_List **source,
+ const char *parts)
+{
+ Eina_List *res = it->icon_objs;
+
+ if (it->itc->func.icon_get)
+ {
+ const Eina_List *l;
+ const char *key;
+ Evas_Object *ic = NULL;
+
+ EINA_LIST_FOREACH(*source, l, key)
+ {
+ if (parts && fnmatch(parts, key, FNM_PERIOD))
+ continue;
+
+ ic = edje_object_part_swallow_get(target, key);
+ if (ic)
+ {
+ res = eina_list_remove(res, ic);
+ edje_object_part_unswallow(target, ic);
+ evas_object_del(ic);
+ }
+ }
+ }
+
+ return res;
}
static Eina_List *
_item_icon_realize(Elm_Genlist_Item *it,
Evas_Object *target,
- Eina_List **source)
+ Eina_List **source,
+ const char *parts)
{
Eina_List *res = NULL;
const char *key;
*source = elm_widget_stringlist_get(edje_object_data_get(target, "icons"));
+ if (parts && (eina_list_count(*source) != eina_list_count(it->icon_objs)))
+ res = it->icon_objs;
EINA_LIST_FOREACH(*source, l, key)
{
+ if (parts && fnmatch(parts, key, FNM_PERIOD))
+ continue;
+
Evas_Object *ic = it->itc->func.icon_get
- ((void *)it->base.data, it->base.widget, key);
+ ((void *)it->base.data, WIDGET(it), key);
if (ic)
{
res = eina_list_append(res, ic);
edje_object_part_swallow(target, key, ic);
evas_object_show(ic);
- elm_widget_sub_object_add(it->base.widget, ic);
+ elm_widget_sub_object_add(WIDGET(it), ic);
evas_object_event_callback_add(ic, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, it);
if (it->disabled)
elm_widget_disabled_set(ic, EINA_TRUE);
static void
_item_state_realize(Elm_Genlist_Item *it,
Evas_Object *target,
- Eina_List **source)
+ Eina_List **source,
+ const char *parts)
{
if (it->itc->func.state_get)
{
*source = elm_widget_stringlist_get(edje_object_data_get(target, "states"));
EINA_LIST_FOREACH(*source, l, key)
{
+ if (parts && fnmatch(parts, key, FNM_PERIOD))
+ continue;
+
Eina_Bool on = it->itc->func.state_get
- ((void *)it->base.data, it->base.widget, key);
+ ((void *)it->base.data, WIDGET(it), key);
if (on)
{
int in,
Eina_Bool calc)
{
- Elm_Genlist_Item *it2;
const char *stacking;
const char *treesize;
char buf[1024];
- int depth, tsize = 20;
+ int tsize = 20;
Item_Cache *itc = NULL;
if ((it->realized) || (it->delete_me)) return;
itc = _item_cache_find(it);
if (itc && (!it->wd->effect_mode))
{
- it->base.view = itc->base_view;
+ VIEW(it) = itc->base_view;
itc->base_view = NULL;
it->spacer = itc->spacer;
itc->spacer = NULL;
}
else
{
- it->base.view = edje_object_add(evas_object_evas_get(it->base.widget));
- edje_object_scale_set(it->base.view,
- elm_widget_scale_get(it->base.widget) *
+ 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);
- evas_object_smart_member_add(it->base.view, it->wd->pan_smart);
- elm_widget_sub_object_add(it->base.widget, it->base.view);
+ evas_object_smart_member_add(VIEW(it), it->wd->pan_smart);
+ elm_widget_sub_object_add(WIDGET(it), VIEW(it));
if (it->flags & ELM_GENLIST_ITEM_SUBITEMS)
strncpy(buf, "tree", sizeof(buf));
strncat(buf, "/", sizeof(buf) - strlen(buf));
strncat(buf, it->itc->item_style, sizeof(buf) - strlen(buf));
- _elm_theme_object_set(it->base.widget, it->base.view, "genlist", buf,
- elm_widget_style_get(it->base.widget));
- edje_object_mirrored_set(it->base.view,
- elm_widget_mirrored_get(it->base.widget));
+ _elm_theme_object_set(WIDGET(it), VIEW(it), "genlist", buf,
+ elm_widget_style_get(WIDGET(it)));
+ edje_object_mirrored_set(VIEW(it),
+ elm_widget_mirrored_get(WIDGET(it)));
it->spacer =
- evas_object_rectangle_add(evas_object_evas_get(it->base.widget));
+ evas_object_rectangle_add(evas_object_evas_get(WIDGET(it)));
evas_object_color_set(it->spacer, 0, 0, 0, 0);
- elm_widget_sub_object_add(it->base.widget, it->spacer);
+ elm_widget_sub_object_add(WIDGET(it), it->spacer);
}
- for (it2 = it, depth = 0; it2->parent; it2 = it2->parent)
- {
- if (it2->parent->flags != ELM_GENLIST_ITEM_GROUP) depth += 1;
- }
- it->expanded_depth = depth;
- treesize = edje_object_data_get(it->base.view, "treesize");
+
+ treesize = edje_object_data_get(VIEW(it), "treesize");
if (treesize) tsize = atoi(treesize);
evas_object_size_hint_min_set(it->spacer,
- (depth * tsize) * _elm_config->scale, 1);
- edje_object_part_swallow(it->base.view, "elm.swallow.pad", it->spacer);
+ (it->expanded_depth * tsize) * _elm_config->scale, 1);
+ edje_object_part_swallow(VIEW(it), "elm.swallow.pad", it->spacer);
if (!calc)
{
- edje_object_signal_callback_add(it->base.view,
+ edje_object_signal_callback_add(VIEW(it),
"elm,action,expand,toggle",
"elm", _signal_expand_toggle, it);
- edje_object_signal_callback_add(it->base.view, "elm,action,expand",
+ edje_object_signal_callback_add(VIEW(it), "elm,action,expand",
"elm", _signal_expand, it);
- edje_object_signal_callback_add(it->base.view, "elm,action,contract",
+ edje_object_signal_callback_add(VIEW(it), "elm,action,contract",
"elm", _signal_contract, it);
- stacking = edje_object_data_get(it->base.view, "stacking");
+ stacking = edje_object_data_get(VIEW(it), "stacking");
if (stacking)
{
- if (!strcmp(stacking, "below")) evas_object_lower(it->base.view);
+ if (!strcmp(stacking, "below")) evas_object_lower(VIEW(it));
else if (!strcmp(stacking, "above"))
- evas_object_raise(it->base.view);
+ evas_object_raise(VIEW(it));
}
- evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MOUSE_DOWN,
+ evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MOUSE_DOWN,
_mouse_down, it);
- evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MOUSE_UP,
+ evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MOUSE_UP,
_mouse_up, it);
- evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MOUSE_MOVE,
+ evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MOUSE_MOVE,
_mouse_move, it);
- evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MULTI_DOWN,
+ evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MULTI_DOWN,
_multi_down, it);
- evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MULTI_UP,
+ evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MULTI_UP,
_multi_up, it);
- evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MULTI_MOVE,
+ evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MULTI_MOVE,
_multi_move, it);
if ((!it->edit_obj) &&(it->wd->edit_mode) &&
{
if ((it->selected) && (it->selected != itc->selected))
{
- edje_object_signal_emit(it->base.view,
+ edje_object_signal_emit(VIEW(it),
"elm,state,selected", "elm");
if (it->edit_obj)
edje_object_signal_emit(it->edit_obj,
}
if ((it->disabled) && (it->disabled != itc->disabled))
{
- edje_object_signal_emit(it->base.view,
+ edje_object_signal_emit(VIEW(it),
"elm,state,disabled", "elm");
if (it->edit_obj)
edje_object_signal_emit(it->edit_obj,
}
if ((it->expanded) && (it->expanded != itc->expanded))
{
- edje_object_signal_emit(it->base.view,
+ edje_object_signal_emit(VIEW(it),
"elm,state,expanded", "elm");
if (it->edit_obj)
edje_object_signal_emit(it->edit_obj,
{
if (it->selected)
{
- edje_object_signal_emit(it->base.view,
+ edje_object_signal_emit(VIEW(it),
"elm,state,selected", "elm");
if (it->edit_obj)
edje_object_signal_emit(it->edit_obj,
}
if (it->disabled)
{
- edje_object_signal_emit(it->base.view,
+ edje_object_signal_emit(VIEW(it),
"elm,state,disabled", "elm");
if (it->edit_obj)
edje_object_signal_emit(it->edit_obj,
}
if (it->expanded)
{
- edje_object_signal_emit(it->base.view,
+ edje_object_signal_emit(VIEW(it),
"elm,state,expanded", "elm");
if (it->edit_obj)
edje_object_signal_emit(it->edit_obj,
}
else
{
- _item_label_realize(it, it->base.view, &it->labels);
- it->icon_objs = _item_icon_realize(it, it->base.view, &it->icons);
- _item_state_realize(it, it->base.view, &it->states);
+ _item_label_realize(it, VIEW(it), &it->labels, NULL);
+ it->icon_objs = _item_icon_realize(it, VIEW(it), &it->icons, NULL);
+ _item_state_realize(it, VIEW(it), &it->states, NULL);
if (it->itc->func.icon_get) // for rename mode
{
const Eina_List *l;
const char *key;
if (it->renamed)
{
+ edje_object_signal_emit(VIEW(it), "elm,state,rename,enabled", "elm");
it->icons =
- elm_widget_stringlist_get(edje_object_data_get(it->base.view, "renames"));
+ elm_widget_stringlist_get(edje_object_data_get(VIEW(it), "renames"));
EINA_LIST_FOREACH(it->icons, l, key)
{
Evas_Object *ic = it->itc->func.icon_get
- ((void *)it->base.data, it->base.widget, l->data);
+ ((void *)it->base.data, WIDGET(it), l->data);
if (ic)
{
it->icon_objs = eina_list_append(it->icon_objs, ic);
- edje_object_part_swallow(it->base.view, key, ic);
+ edje_object_part_swallow(VIEW(it), key, ic);
evas_object_show(ic);
- elm_widget_sub_object_add(it->base.widget, ic);
+ elm_widget_sub_object_add(WIDGET(it), ic);
// FIXME: if entry calcuates its cursor position correctly and conformant works,
// genlist does not need to handle this focus thing.
evas_object_smart_callback_add(ic, "focused", _icon_focused, it);
if (!it->display_only)
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
if (it->wd->height_for_width) mw = it->wd->prev_viewport_w;
- edje_object_size_min_restricted_calc(it->base.view, &mw, &mh, mw,
+ edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw,
mh);
if (!it->display_only)
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
it->wd->item_height = mh;
}
}
- if (!calc) evas_object_show(it->base.view);
+ if (!calc) evas_object_show(VIEW(it));
}
if (it->tooltip.content_cb)
evas_event_thaw(evas_object_evas_get(it->wd->obj));
evas_event_thaw_eval(evas_object_evas_get(it->wd->obj));
if (!calc)
- evas_object_smart_callback_call(it->base.widget, SIG_REALIZED, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_REALIZED, it);
if ((!calc) && (it->wd->edit_mode) && (it->flags != ELM_GENLIST_ITEM_GROUP))
{
if (it->itc->edit_item_style)
edje_object_message_signal_process(it->edit_obj);
}
}
- edje_object_message_signal_process(it->base.view);
+ edje_object_message_signal_process(VIEW(it));
}
static void
if (it->defer_unrealize && !it->updateme) return;
evas_event_freeze(evas_object_evas_get(it->wd->obj));
if (!calc)
- evas_object_smart_callback_call(it->base.widget, SIG_UNREALIZED, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_UNREALIZED, it);
if (it->long_timer)
{
ecore_timer_del(it->long_timer);
}
if (it->nocache)
{
- evas_object_del(it->base.view);
- it->base.view = NULL;
+ evas_object_del(VIEW(it));
+ VIEW(it) = NULL;
evas_object_del(it->spacer);
it->spacer = NULL;
}
else
{
- edje_object_mirrored_set(it->base.view,
- elm_widget_mirrored_get(it->base.widget));
- edje_object_scale_set(it->base.view,
- elm_widget_scale_get(it->base.widget)
+ edje_object_mirrored_set(VIEW(it),
+ elm_widget_mirrored_get(WIDGET(it)));
+ edje_object_scale_set(VIEW(it),
+ elm_widget_scale_get(WIDGET(it))
* _elm_config->scale);
_item_cache_add(it);
}
evas_event_freeze(evas_object_evas_get(itb->wd->obj));
EINA_LIST_FOREACH(itb->items, l, it)
{
- if (it->flags != ELM_GENLIST_ITEM_GROUP)
+ if (itb->must_recalc || it->flags != ELM_GENLIST_ITEM_GROUP)
{
if (it->dragging)
{
if (!reorder_it) return 0;
evas_object_geometry_get(it->wd->pan_smart, NULL, &oy, NULL, &oh);
- evas_object_geometry_get(it->wd->reorder_it->base.view, &rox, &roy, &row, &roh);
+ evas_object_geometry_get(it->wd->VIEW(reorder_it), &rox, &roy, &row, &roh);
if ((it->wd->reorder_start_y < it->block->y) &&
(roy - oy + (roh / 2) >= it->block->y - it->wd->pan_y))
if (it->edit_obj)
_item_position(it, it->edit_obj, it->scrl_x, it->old_scrl_y);
else
- _item_position(it, it->base.view, it->scrl_x, it->old_scrl_y);
- _group_items_recalc(it->wd);
+ _item_position(it, VIEW(it), it->scrl_x, it->old_scrl_y);
if ((it->wd->reorder_pan_move) ||
(down && it->old_scrl_y >= it->scrl_y) ||
(!down && it->old_scrl_y <= it->scrl_y))
{
const Eina_List *l;
Elm_Genlist_Item *it;
- Elm_Genlist_Item *git;
Evas_Coord y = 0, ox, oy, ow, oh, cvx, cvy, cvw, cvh;
Evas_Coord minh = 0;
int vis = 0;
vis = (ELM_RECTS_INTERSECT(it->scrl_x, it->scrl_y, it->w, it->h,
cvx, cvy, cvw, cvh));
- if (it->flags != ELM_GENLIST_ITEM_GROUP)
+ if ((itb->realized))
{
- if ((itb->realized))
+ if (vis)
{
- if (vis)
- {
- if (!it->realized) _item_realize(it, in, EINA_FALSE);
- if (it->renamed)
- {
- if (it->wd->edit_mode) edje_object_signal_emit(it->edit_obj, "elm,state,rename,enabled", "elm");
- edje_object_signal_emit(it->base.view, "elm,state,rename,enabled", "elm");
- }
- }
+ if (!it->realized) _item_realize(it, in, EINA_FALSE);
}
- if (it->realized)
+ }
+ if (it->realized)
+ {
+ if (vis)
{
- if (vis)
+ if (it->wd->reorder_mode)
+ y += _get_space_for_reorder_item(it);
+ if ((it->wd->reorder_it) && (it->old_scrl_y != it->scrl_y))
{
- if (it->wd->reorder_mode)
- y += _get_space_for_reorder_item(it);
- git = it->group_item;
- if (git)
- {
- git->scrl_x = it->scrl_x;
- if (git->scrl_y < oy)
- git->scrl_y = oy;
- if ((git->scrl_y + git->h) > (it->scrl_y + it->h))
- git->scrl_y = (it->scrl_y + it->h) - git->h;
- git->want_realize = EINA_TRUE;
- }
- if ((it->wd->reorder_it) && (it->old_scrl_y != it->scrl_y))
+ if (!it->move_effect_enabled)
{
- if (!it->move_effect_enabled)
- {
- it->move_effect_enabled = EINA_TRUE;
- it->wd->reorder_move_animator =
- ecore_animator_add(
- _reorder_move_animator_cb, it);
- }
+ it->move_effect_enabled = EINA_TRUE;
+ it->wd->reorder_move_animator =
+ ecore_animator_add(
+ _reorder_move_animator_cb, it);
}
- if (!it->move_effect_enabled)
- if (!it->wd->effect_mode || it->wd->move_effect_mode == ELM_GENLIST_ITEM_MOVE_EFFECT_NONE || ((it->wd->move_effect_mode != ELM_GENLIST_ITEM_MOVE_EFFECT_DELETE) && it->parent == it->wd->expand_item))
- {
- if (it->wd->edit_mode && it->itc->edit_item_style)
+ }
+ if (!it->move_effect_enabled)
+ if (!it->wd->effect_mode || it->wd->move_effect_mode == ELM_GENLIST_ITEM_MOVE_EFFECT_NONE || ((it->wd->move_effect_mode != ELM_GENLIST_ITEM_MOVE_EFFECT_DELETE) && it->parent == it->wd->expand_item))
+ {
+ if (it->wd->edit_mode && it->itc->edit_item_style)
+ {
+ _item_position(it, it->edit_obj, it->scrl_x, it->scrl_y);
+ }
+ else
+ {
+ if((!it->wd->effect_mode || it->wd->move_effect_mode == ELM_GENLIST_ITEM_MOVE_EFFECT_NONE) || ((it->wd->move_effect_mode != ELM_GENLIST_ITEM_MOVE_EFFECT_NONE) && (it->old_scrl_y == it->scrl_y)))
{
- _item_position(it, it->edit_obj, it->scrl_x, it->scrl_y);
+ if (it->mode_view)
+ _item_position(it, it->mode_view, it->scrl_x,
+ it->scrl_y);
+ else
+ _item_position(it, VIEW(it), it->scrl_x,
+ it->scrl_y);
}
else
- {
- if((!it->wd->effect_mode || it->wd->move_effect_mode == ELM_GENLIST_ITEM_MOVE_EFFECT_NONE) || ((it->wd->move_effect_mode != ELM_GENLIST_ITEM_MOVE_EFFECT_NONE) && (it->old_scrl_y == it->scrl_y)))
- {
- if (it->mode_view)
- _item_position(it, it->mode_view, it->scrl_x,
- it->scrl_y);
- else
- _item_position(it, it->base.view, it->scrl_x,
- it->scrl_y);
- }
- else
- {
- evas_object_resize(it->base.view, it->w, it->h);
- evas_object_move(it->base.view, it->scrl_x, it->scrl_y);
- evas_object_hide(it->base.view);
- }
- }
- }
- }
- else
- {
- if (!it->dragging && (!it->wd->item_moving_effect_timer)) _item_unrealize(it, EINA_FALSE);
- }
+ {
+ evas_object_resize(VIEW(it), it->w, it->h);
+ evas_object_move(VIEW(it), it->scrl_x, it->scrl_y);
+ evas_object_hide(VIEW(it));
+ }
+ }
+ }
+ }
+ else
+ {
+ if (!it->dragging && (!it->wd->item_moving_effect_timer)) _item_unrealize(it, EINA_FALSE);
}
- in++;
- }
- else
- {
- if (vis) it->want_realize = EINA_TRUE;
}
+ in++;
if (!it->wd->effect_mode || it->wd->move_effect_mode == ELM_GENLIST_ITEM_MOVE_EFFECT_NONE || ((it->wd->move_effect_mode != ELM_GENLIST_ITEM_MOVE_EFFECT_DELETE) && it->parent == it->wd->expand_item))
{
it->old_scrl_y = it->scrl_y;
it->wd->changed_job = ecore_job_add(_changed_job, it->wd);
}
-static void
-_group_items_recalc(void *data)
-{
- Widget_Data *wd = data;
- Eina_List *l;
- Elm_Genlist_Item *git;
-
- evas_event_freeze(evas_object_evas_get(wd->obj));
- EINA_LIST_FOREACH(wd->group_items, l, git)
- {
- if (git->want_realize)
- {
- if (!git->realized)
- _item_realize(git, 0, EINA_FALSE);
- evas_object_resize(git->base.view, wd->minw, git->h);
- evas_object_move(git->base.view, git->scrl_x, git->scrl_y);
- evas_object_show(git->base.view);
- evas_object_raise(git->base.view);
- }
- else if (!git->want_realize && git->realized)
- {
- if (!git->dragging)
- _item_unrealize(git, EINA_FALSE);
- }
- }
- evas_event_thaw(evas_object_evas_get(wd->obj));
- evas_event_thaw_eval(evas_object_evas_get(wd->obj));
-}
-
static Eina_Bool
_must_recalc_idler(void *data)
{
if (it->mincalcd) it->mincalcd = EINA_FALSE;
itb->changed = EINA_TRUE;
if (itb->must_recalc) did_must_recalc = EINA_TRUE;
- itb->must_recalc = EINA_FALSE;
if (itb->realized) _item_block_unrealize(itb);
+ itb->must_recalc = EINA_FALSE;
}
showme = _item_block_recalc(itb, in, EINA_FALSE);
chb = itb;
if (!it->display_only)
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
if (it->wd->height_for_width) mw = it->wd->prev_viewport_w;
- edje_object_size_min_restricted_calc(it->base.view, &mw, &mh, mw, mh);
+ edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh);
if (!it->display_only)
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
+ if (mw > itb->w)
+ width_changed = EINA_TRUE;
+ else
+ mw = itb->w;
it->w = it->minw = mw;
it->h = it->minh = mh;
it->mincalcd = EINA_TRUE;
evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
sd->wd->prev_viewport_w = ow;
evas_output_viewport_get(evas_object_evas_get(obj), &cvx, &cvy, &cvw, &cvh);
- EINA_LIST_FOREACH(sd->wd->group_items, l, git)
- {
- git->want_realize = EINA_FALSE;
- }
EINA_INLIST_FOREACH(sd->wd->blocks, itb)
{
itb->w = sd->wd->minw;
}
in += itb->count;
}
- if ((!sd->wd->reorder_it) || (sd->wd->reorder_pan_move))
- _group_items_recalc(sd->wd);
if ((sd->wd->reorder_mode) && (sd->wd->reorder_it))
{
}
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__)
+{
+ evas_object_smart_callback_call(data, SIG_SCROLL_DRAG_START, NULL);
+}
+
+static void
+_scr_drag_stop(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ evas_object_smart_callback_call(data, SIG_SCROLL_DRAG_STOP, NULL);
+}
+
+static void
_scroll_edge_left(void *data,
Evas_Object *scr __UNUSED__,
void *event_info __UNUSED__)
if ((it->mode_view) || (it->delete_me)) return;
evas_event_freeze(evas_object_evas_get(it->wd->obj));
- it->mode_view = edje_object_add(evas_object_evas_get(it->base.widget));
+ it->mode_view = edje_object_add(evas_object_evas_get(WIDGET(it)));
edje_object_scale_set(it->mode_view,
- elm_widget_scale_get(it->base.widget) *
+ elm_widget_scale_get(WIDGET(it)) *
_elm_config->scale);
evas_object_smart_member_add(it->mode_view, it->wd->pan_smart);
- elm_widget_sub_object_add(it->base.widget, it->mode_view);
+ elm_widget_sub_object_add(WIDGET(it), it->mode_view);
strncpy(buf, "item", sizeof(buf));
if (it->wd->compress)
strncat(buf, "/", sizeof(buf) - strlen(buf));
strncat(buf, it->itc->mode_item_style, sizeof(buf) - strlen(buf));
- _elm_theme_object_set(it->base.widget, it->mode_view, "genlist", buf,
- elm_widget_style_get(it->base.widget));
+ _elm_theme_object_set(WIDGET(it), it->mode_view, "genlist", buf,
+ elm_widget_style_get(WIDGET(it)));
edje_object_mirrored_set(it->mode_view,
- elm_widget_mirrored_get(it->base.widget));
+ elm_widget_mirrored_get(WIDGET(it)));
/* signal callback add */
evas_object_event_callback_add(it->mode_view, EVAS_CALLBACK_MOUSE_DOWN,
_mouse_move, it);
/* label_get, icon_get, state_get */
- _item_label_realize(it, it->mode_view, &it->mode_labels);
+ _item_label_realize(it, it->mode_view, &it->mode_labels, NULL);
if (it->itc->func.icon_get)
{
const Eina_List *l;
EINA_LIST_FOREACH(it->mode_icons, l, key)
{
Evas_Object *ic = it->itc->func.icon_get
- ((void *)it->base.data, it->base.widget, l->data);
+ ((void *)it->base.data, WIDGET(it), l->data);
if (ic)
{
it->mode_icon_objs = eina_list_append(it->mode_icon_objs, ic);
edje_object_part_swallow(it->mode_view, key, ic);
evas_object_show(ic);
- elm_widget_sub_object_add(it->base.widget, ic);
+ elm_widget_sub_object_add(WIDGET(it), ic);
if (it->disabled)
elm_widget_disabled_set(ic, EINA_TRUE);
}
}
}
- _item_state_realize(it, it->mode_view, &it->mode_states);
+ _item_state_realize(it, it->mode_view, &it->mode_states, NULL);
edje_object_part_swallow(it->mode_view,
edje_object_data_get(it->mode_view, "mode_part"),
- it->base.view);
+ VIEW(it));
it->want_unrealize = EINA_FALSE;
evas_event_thaw(evas_object_evas_get(it->wd->obj));
EINA_LIST_FREE(it->mode_icon_objs, icon)
evas_object_del(icon);
- edje_object_part_unswallow(it->mode_view, it->base.view);
- evas_object_smart_member_add(it->base.view, wd->pan_smart);
+ edje_object_part_unswallow(it->mode_view, VIEW(it));
+ evas_object_smart_member_add(VIEW(it), wd->pan_smart);
evas_object_del(it->mode_view);
it->mode_view = NULL;
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);
+ evas_object_raise(it->VIEW(group_item));
_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);
+ evas_object_event_callback_add(wd->scr, EVAS_CALLBACK_MOUSE_DOWN,
+ _mouse_down_scroller, obj);
+ evas_object_event_callback_add(wd->scr, EVAS_CALLBACK_MOUSE_UP,
+ _mouse_up_scroller, obj);
+ evas_object_event_callback_add(wd->scr, EVAS_CALLBACK_MOUSE_MOVE,
+ _mouse_move_scroller, obj);
elm_smart_scroller_widget_set(wd->scr, obj);
elm_smart_scroller_object_theme_set(obj, wd->scr, "genlist", "base",
elm_widget_style_get(obj));
_elm_config->thumbscroll_bounce_enable);
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", _scroll_edge_left, obj);
evas_object_smart_callback_add(wd->scr, "edge,right", _scroll_edge_right,
obj);
Evas_Smart_Cb func,
const void *func_data)
{
- Elm_Genlist_Item *it;
+ Elm_Genlist_Item *it, *it2;
+ int depth = 0;
it = elm_widget_item_new(wd->obj, Elm_Genlist_Item);
if (!it) return NULL;
it->func.data = func_data;
it->mouse_cursor = NULL;
it->expanded_depth = 0;
+ it->can_focus = EINA_TRUE;
elm_widget_item_text_get_hook_set(it, _item_label_hook);
+ elm_widget_item_del_cb_set(it, _item_del_hook);
if (it->parent)
{
else if (it->parent->group_item)
it->group_item = it->parent->group_item;
}
+ for (it2 = it, depth = 0; it2->parent; it2 = it2->parent)
+ {
+ if (it2->parent->flags != ELM_GENLIST_ITEM_GROUP) depth += 1;
+ }
+ it->expanded_depth = depth;
return it;
}
{
showme = _item_block_recalc(it->block, it->block->num, EINA_TRUE);
it->block->changed = 0;
+ if(wd->pan_changed)
+ {
+ if (wd->calc_job) ecore_job_del(wd->calc_job);
+ wd->calc_job = NULL;
+ _calc_job(wd);
+ wd->pan_changed = EINA_FALSE;
+ }
}
if (showme) it->block->showme = EINA_TRUE;
if (eina_inlist_count(wd->blocks) > 1)
// TODO: change this to smart callback
if (it->itc->func.moved)
- it->itc->func.moved(it->base.widget, it, after, EINA_TRUE);
+ it->itc->func.moved(WIDGET(it), it, after, EINA_TRUE);
}
static void
// TODO: change this to smart callback
if (it->itc->func.moved)
- it->itc->func.moved(it->base.widget, it, before, EINA_FALSE);
+ it->itc->func.moved(WIDGET(it), it, before, EINA_FALSE);
}
EAPI Elm_Genlist_Item *
if (!wd) return NULL;
Elm_Genlist_Item *it = _item_new(wd, itc, data, parent, flags, func,
func_data);
+
if (!it) return NULL;
if (!it->parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(after, NULL);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(wd->items, NULL);
Elm_Genlist_Item *it = _item_new(wd, itc, data, parent, flags, func,
func_data);
if (!it) return NULL;
- /* It makes no sense to insert after in an empty list with after != NULL, something really bad is happening in your app. */
- EINA_SAFETY_ON_NULL_RETURN_VAL(wd->items, NULL);
if (!it->parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(before, NULL);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(wd->items, NULL);
Elm_Genlist_Item *it = _item_new(wd, itc, data, parent, flags, func,
func_data);
if (!it) return NULL;
- /* It makes no sense to insert before in an empty list with before != NULL, something really bad is happening in your app. */
- EINA_SAFETY_ON_NULL_RETURN_VAL(wd->items, NULL);
if (!it->parent)
{
elm_widget_item_pre_notify_del(it);
if (it->realized) _item_unrealize(it, EINA_FALSE);
if (((wd->clear_me) || (!it->delete_me)) && (it->itc->func.del))
- it->itc->func.del((void *)it->base.data, it->base.widget);
+ it->itc->func.del((void *)it->base.data, WIDGET(it));
if (it->long_timer) ecore_timer_del(it->long_timer);
if (it->swipe_timer) ecore_timer_del(it->swipe_timer);
elm_widget_item_del(it);
if (itb->items) eina_list_free(itb->items);
free(itb);
}
+ wd->pan_changed = EINA_TRUE;
if (wd->calc_job)
{
ecore_job_del(wd->calc_job);
elm_genlist_item_genlist_get(const Elm_Genlist_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
- return it->base.widget;
+ return WIDGET(it);
}
EAPI Elm_Genlist_Item *
elm_genlist_item_subitems_clear(Elm_Genlist_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
- Elm_Genlist_Item *it2;
+ Widget_Data *wd = elm_widget_data_get(WIDGET(it));
+ if (!wd) return;
+ Elm_Genlist_Item *it2, *it3;
Evas_Coord y, h;
- if (!it->wd->effect_mode || !it->wd->move_effect_mode)
+ if (!wd->effect_mode || !wd->move_effect_mode)
_item_subitems_clear(it);
else
{
- if ((!it->wd->item_moving_effect_timer) && (it->flags != ELM_GENLIST_ITEM_GROUP) &&
- it->wd->move_effect_mode != ELM_GENLIST_ITEM_MOVE_EFFECT_DELETE )
+ if ((!wd->item_moving_effect_timer) && (it->flags != ELM_GENLIST_ITEM_GROUP) &&
+ wd->move_effect_mode != ELM_GENLIST_ITEM_MOVE_EFFECT_DELETE)
{
- it->wd->expand_item = it;
+ wd->expand_item = it;
_item_flip_effect_show(it);
- evas_object_geometry_get(it->base.view, NULL, &y, NULL, &h);
- it->wd->expand_item_end = y + h;
+ evas_object_geometry_get(VIEW(it), NULL, &y, NULL, &h);
+ wd->expand_item_end = y + h;
- it2= it;
+ it2= it;
do {
it2 = elm_genlist_item_next_get(it2);
if (!it2) break;
} while (it2->expanded_depth > it->expanded_depth);
if (it2)
- it->wd->expand_item_gap = it->wd->expand_item_end - it2->old_scrl_y;
+ {
+ int diff;
+ Evas_Coord vy, vh;
+ evas_output_viewport_get(evas_object_evas_get(wd->pan_smart), NULL, &vy, NULL, &vh);
+ diff = it2->old_scrl_y - (vy + vh);
+ if (diff > 0)
+ {
+ it3 = it2;
+ while (it3)
+ {
+ it3->old_scrl_y = it3->old_scrl_y - diff;
+ it3 = elm_genlist_item_next_get(it3);
+ }
+ }
+
+ wd->expand_item_gap = wd->expand_item_end - it2->old_scrl_y;
+ }
else
- it->wd->expand_item_gap = 0;
+ wd->expand_item_gap = 0;
- evas_object_raise(it->wd->alpha_bg);
- evas_object_show(it->wd->alpha_bg);
+ evas_object_raise(wd->alpha_bg);
+ evas_object_show(wd->alpha_bg);
- it->wd->start_time = current_time_get();
- it->wd->item_moving_effect_timer = ecore_animator_add(_item_moving_effect_timer_cb, it->wd);
+ wd->start_time = current_time_get();
+ wd->item_moving_effect_timer = ecore_animator_add(_item_moving_effect_timer_cb, wd);
}
else
_item_subitems_clear(it);
Eina_Bool selected)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
- Widget_Data *wd = elm_widget_data_get(it->base.widget);
+ Widget_Data *wd = elm_widget_data_get(WIDGET(it));
if (!wd) return;
if ((it->delete_me) || (it->disabled)) return;
selected = !!selected;
it->wd->expand_item = it;
if (it->wd->effect_mode && !it->wd->alpha_bg)
- it->wd->alpha_bg = _create_tray_alpha_bg(it->base.widget);
+ it->wd->alpha_bg = _create_tray_alpha_bg(WIDGET(it));
if (it->expanded)
{
it->wd->auto_scrolled = EINA_FALSE;
it->wd->move_effect_mode = ELM_GENLIST_ITEM_MOVE_EFFECT_EXPAND;
if (it->realized)
- edje_object_signal_emit(it->base.view, "elm,state,expanded", "elm");
- evas_object_smart_callback_call(it->base.widget, "expanded", it);
+ edje_object_signal_emit(VIEW(it), "elm,state,expanded", "elm");
+ evas_object_smart_callback_call(WIDGET(it), "expanded", it);
}
else
{
it->wd->move_effect_mode = ELM_GENLIST_ITEM_MOVE_EFFECT_CONTRACT;
if (it->realized)
- edje_object_signal_emit(it->base.view, "elm,state,contracted", "elm");
- evas_object_smart_callback_call(it->base.widget, "contracted", it);
+ edje_object_signal_emit(VIEW(it), "elm,state,contracted", "elm");
+ evas_object_smart_callback_call(WIDGET(it), "contracted", it);
}
}
{
if (it->disabled)
{
- edje_object_signal_emit(it->base.view, "elm,state,disabled", "elm");
+ edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
if (it->edit_obj)
edje_object_signal_emit(it->edit_obj, "elm,state,disabled", "elm");
}
else
{
- edje_object_signal_emit(it->base.view, "elm,state,enabled", "elm");
+ edje_object_signal_emit(VIEW(it), "elm,state,enabled", "elm");
if (it->edit_obj)
edje_object_signal_emit(it->edit_obj, "elm,state,enabled", "elm");
}
elm_genlist_item_show(Elm_Genlist_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
- Evas_Coord gith = 0;
if (it->delete_me) return;
if ((it->queued) || (!it->mincalcd))
{
it->wd->show_item->showme = EINA_FALSE;
it->wd->show_item = NULL;
}
- if ((it->group_item) && (it->wd->pan_y > (it->y + it->block->y)))
- gith = it->group_item->h;
elm_smart_scroller_child_region_show(it->wd->scr,
it->x + it->block->x,
- it->y + it->block->y - gith,
+ it->y + it->block->y,
it->block->w, it->h);
}
elm_genlist_item_bring_in(Elm_Genlist_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
- Evas_Coord gith = 0;
if (it->delete_me) return;
if ((it->queued) || (!it->mincalcd))
{
it->wd->show_item->showme = EINA_FALSE;
it->wd->show_item = NULL;
}
- if ((it->group_item) && (it->wd->pan_y > (it->y + it->block->y)))
- gith = it->group_item->h;
elm_smart_scroller_region_bring_in(it->wd->scr,
it->x + it->block->x,
- it->y + it->block->y - gith,
+ it->y + it->block->y,
it->block->w, it->h);
}
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
Evas_Coord ow, oh;
- Evas_Coord gith = 0;
if (it->delete_me) return;
if ((it->queued) || (!it->mincalcd))
it->wd->show_item = NULL;
}
evas_object_geometry_get(it->wd->pan_smart, NULL, NULL, &ow, &oh);
- if (it->group_item) gith = it->group_item->h;
elm_smart_scroller_child_region_show(it->wd->scr,
it->x + it->block->x,
- it->y + it->block->y - gith,
+ it->y + it->block->y,
it->block->w, oh);
}
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
Evas_Coord ow, oh;
- Evas_Coord gith = 0;
if (it->delete_me) return;
if ((it->queued) || (!it->mincalcd))
it->wd->show_item = NULL;
}
evas_object_geometry_get(it->wd->pan_smart, NULL, NULL, &ow, &oh);
- if (it->group_item) gith = it->group_item->h;
elm_smart_scroller_region_bring_in(it->wd->scr,
it->x + it->block->x,
- it->y + it->block->y - gith,
+ it->y + it->block->y,
it->block->w, oh);
}
it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
}
if (it->itc->func.del)
- it->itc->func.del((void *)it->base.data, it->base.widget);
+ it->itc->func.del((void *)it->base.data, WIDGET(it));
return;
}
_item_del(it);
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
elm_widget_item_data_set(it, data);
- elm_genlist_item_update(it);
}
EAPI void *
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
EINA_LIST_FREE(it->icon_objs, icon)
{
- elm_widget_sub_object_del(it->base.widget, icon);
+ elm_widget_sub_object_del(WIDGET(it), icon);
evas_object_smart_member_del(icon);
evas_object_hide(icon);
}
elm_genlist_item_object_get(const Elm_Genlist_Item *it)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
- return it->base.view;
+ return VIEW(it);
}
EAPI void
}
EAPI void
+elm_genlist_item_fields_update(Elm_Genlist_Item *it,
+ const char *parts,
+ Elm_Genlist_Item_Field_Flags itf)
+{
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ if (!it->block) return;
+ if (it->delete_me) return;
+
+ if ((!itf) || (itf & ELM_GENLIST_ITEM_FIELD_LABEL))
+ _item_label_realize(it, VIEW(it), &it->labels, parts);
+ if ((!itf) || (itf & ELM_GENLIST_ITEM_FIELD_ICON))
+ {
+ it->icon_objs = _item_icon_unrealize(it, VIEW(it),
+ &it->icons, parts);
+ it->icon_objs = _item_icon_realize(it, VIEW(it),
+ &it->icons, parts);
+
+ if (it->renamed)
+ {
+ it->icon_objs = _item_mode_icon_unrealize(it, VIEW(it),
+ &it->icons, parts, &it->icon_objs);
+ it->icon_objs = _item_mode_icon_realize(it, VIEW(it),
+ &it->icons, parts, &it->icon_objs, "renames");
+ }
+
+ if (it->mode_view)
+ {
+ it->mode_icon_objs = _item_mode_icon_unrealize(it, it->mode_view,
+ &it->mode_icons, parts, &it->mode_icon_objs);
+ it->mode_icon_objs = _item_mode_icon_realize(it, it->mode_view,
+ &it->mode_icons, parts, &it->mode_icon_objs, "icons");
+ }
+
+ if (it->wd->edit_mode)
+ {
+ it->edit_icon_objs = _item_mode_icon_unrealize(it, it->edit_obj,
+ &it->icons, parts, &it->edit_icon_objs);
+ it->edit_icon_objs = _item_mode_icon_realize(it, it->edit_obj,
+ &it->icons, parts, &it->edit_icon_objs, "edit_icons");
+ }
+ }
+ if ((!itf) || (itf & ELM_GENLIST_ITEM_FIELD_STATE))
+ _item_state_realize(it, VIEW(it), &it->states, parts);
+}
+
+EAPI void
elm_genlist_item_item_class_update(Elm_Genlist_Item *it,
const Elm_Genlist_Item_Class *itc)
{
item->tooltip.data = data;
item->tooltip.del_cb = del_cb;
- if (item->base.view)
+ if (VIEW(item))
{
elm_widget_item_tooltip_content_cb_set(item,
item->tooltip.content_cb,
return item->tooltip.style;
}
+EAPI Eina_Bool
+elm_genlist_item_tooltip_size_restrict_disable(Elm_Genlist_Item *item, Eina_Bool disable)
+{
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
+ return elm_widget_item_tooltip_size_restrict_disable(item, disable);
+}
+
+EAPI Eina_Bool
+elm_genlist_item_tooltip_size_restrict_disabled_get(const Elm_Genlist_Item *item)
+{
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
+ return elm_widget_item_tooltip_size_restrict_disabled_get(item);
+}
+
EAPI void
elm_genlist_item_cursor_set(Elm_Genlist_Item *item,
const char *cursor)
if (!item->mouse_cursor)
return;
- if (item->base.view)
+ if (VIEW(item))
elm_widget_item_cursor_unset(item);
eina_stringshare_del(item->mouse_cursor);
}
EAPI const char *
+elm_genlist_mode_item_style_get(const Evas_Object *obj)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return NULL;
+ return wd->mode_item->itc->mode_item_style;
+}
+
+EAPI void
+elm_genlist_mode_item_style_set(Evas_Object *obj, const char *style)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ if ((style == wd->mode_item->itc->mode_item_style) ||
+ (style && wd->mode_item->itc->mode_item_style &&
+ (!strcmp(style, wd->mode_item->itc->mode_item_style))))
+ return;
+ eina_stringshare_replace(&wd->mode_item->itc->mode_item_style, style);
+ elm_genlist_realized_items_update(obj);
+}
+
+EAPI const char *
elm_genlist_mode_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh;
Elm_Genlist_Item *it = NULL, *it2;
const Eina_List *l;
- double time = 0.3, t;
+ double time = 0.5, t;
int y, dy;
- Eina_Bool check, end = EINA_FALSE;
+ Eina_Bool check, end = EINA_FALSE, vis = EINA_TRUE;
int in = 0;
t = ((0.0 > (t = current_time_get() - wd->start_time)) ? 0.0 : t) / 1000;
evas_output_viewport_get(evas_object_evas_get(wd->pan_smart), &cvx, &cvy, &cvw, &cvh);
if (t > time) end = EINA_TRUE;
+ // Below while statement is needed, when the genlist is resized.
+ it2 = wd->expand_item;
+ while (it2 && vis)
+ {
+ evas_object_move(VIEW(it2), it2->scrl_x, it2->scrl_y);
+ vis = (ELM_RECTS_INTERSECT(it2->scrl_x, it2->scrl_y, it2->w, it2->h,
+ cvx, cvy, cvw, cvh));
+ it2 = elm_genlist_item_prev_get(it2);
+ }
it2 = elm_genlist_item_next_get(wd->expand_item);
while (it2)
{
if (it2)
{
if (wd->move_effect_mode == ELM_GENLIST_ITEM_MOVE_EFFECT_EXPAND)
- dy = it2->scrl_y - it2->old_scrl_y;
+ dy = ((it2->scrl_y > cvy + cvh) ? cvy + cvh : it2->scrl_y) - it2->old_scrl_y;
else if (wd->move_effect_mode == ELM_GENLIST_ITEM_MOVE_EFFECT_CONTRACT)
dy = wd->expand_item_gap;
if (wd->edit_mode) _effect_item_controls(it, it->scrl_x, it->old_scrl_y + y);
else
{
- evas_object_resize(it->base.view, it->w, it->h);
- evas_object_move(it->base.view, it->scrl_x, it->old_scrl_y + y);
- evas_object_show(it->base.view);
- evas_object_raise(it->base.view);
+ evas_object_resize(VIEW(it), it->w, it->h);
+ evas_object_move(VIEW(it), it->scrl_x, it->old_scrl_y + y);
+ evas_object_show(VIEW(it));
+ evas_object_raise(VIEW(it));
}
if (it->group_item) evas_object_raise(it->group_item->base.view);
{
if (!it->effect_done)
{
- edje_object_signal_emit(it->base.view, "flip_item", "");
- evas_object_show(it->base.view);
+ edje_object_signal_emit(VIEW(it), "flip_item", "");
+ evas_object_show(VIEW(it));
it->effect_done = EINA_TRUE;
}
}
{
if (!it->effect_done)
{
- edje_object_signal_emit(it->base.view, "elm,state,hide", "");
+ edje_object_signal_emit(VIEW(it), "elm,state,hide", "");
it->effect_done = EINA_TRUE;
}
}
it = elm_genlist_item_prev_get(it);
}
}
- if (wd->calc_job) ecore_job_del(wd->calc_job);
- wd->calc_job = ecore_job_add(_calc_job, wd);
}
else
{
{
if (t >= (((expand_order - 1) * time) / expand_num))
{
- edje_object_signal_emit(it->base.view, "flip_item", "");
- evas_object_show(it->base.view);
+ edje_object_signal_emit(VIEW(it), "flip_item", "");
+ evas_object_show(VIEW(it));
it->effect_done = EINA_TRUE;
}
}
evas_object_smart_callback_call(wd->pan_smart, "changed", NULL);
evas_object_smart_callback_call(wd->obj, "effect_done", NULL);
+ evas_object_smart_changed(wd->pan_smart);
return ECORE_CALLBACK_CANCEL;
}
return ECORE_CALLBACK_RENEW;
Elm_Genlist_Item *it2;
Eina_List *l;
- // printf("%p is emited contract\n", it);
- edje_object_signal_emit(it->base.view, "elm,state,contract_flip", "");
+ edje_object_signal_emit(VIEW(it), "elm,state,contract_flip", "");
it->effect_done = EINA_FALSE;
EINA_LIST_FOREACH(it->items, l, it2)
Elm_Genlist_Item *it2;
Eina_List *l;
Widget_Data *wd = it->wd;
- Eina_Bool check = EINA_FALSE;
- it2 = elm_genlist_item_next_get(it);
- while (it2)
- {
- if (it2->expanded_depth <= it->expanded_depth) check = EINA_TRUE;
- it2 = elm_genlist_item_next_get(it2);
- }
EINA_LIST_FOREACH(it->items, l, it2)
{
if (it2->parent && it == it2->parent)
if (it->mode_view)
_mode_finished_signal_cb(it, (Evas_Object *)elm_genlist_item_object_get(it), NULL, NULL);
- it->edit_obj = edje_object_add(evas_object_evas_get(it->base.widget));
- edje_object_scale_set(it->edit_obj, elm_widget_scale_get(it->base.widget) *
+ it->edit_obj = edje_object_add(evas_object_evas_get(WIDGET(it)));
+ edje_object_scale_set(it->edit_obj, elm_widget_scale_get(WIDGET(it)) *
_elm_config->scale);
evas_object_smart_member_add(it->edit_obj, it->wd->pan_smart);
- elm_widget_sub_object_add(it->base.widget, it->edit_obj);
+ elm_widget_sub_object_add(WIDGET(it), it->edit_obj);
if (it->flags & ELM_GENLIST_ITEM_SUBITEMS) strncpy(buf, "tree", sizeof(buf));
else strncpy(buf, "item", sizeof(buf));
if (it->itc->edit_item_style && strcmp(it->itc->edit_item_style, "default"))
{
strncat(buf, it->itc->edit_item_style, sizeof(buf) - strlen(buf));
- _elm_theme_object_set(it->base.widget, it->edit_obj, "genlist", buf, elm_widget_style_get(it->base.widget));
+ _elm_theme_object_set(WIDGET(it), it->edit_obj, "genlist", buf, elm_widget_style_get(WIDGET(it)));
}
else
{
- _elm_theme_object_set(it->base.widget, it->edit_obj, "genlist", "item/edit_default", elm_widget_style_get(it->base.widget));
+ _elm_theme_object_set(WIDGET(it), it->edit_obj, "genlist", "item/edit_default", elm_widget_style_get(WIDGET(it)));
}
if (it->wd->reorder_mode)
const Eina_List *l;
const char *key;
+ if (it->renamed) edje_object_signal_emit(it->edit_obj, "elm,state,rename,enabled", "elm");
it->icons = elm_widget_stringlist_get(edje_object_data_get(it->edit_obj, "edit_icons"));
EINA_LIST_FOREACH(it->icons, l, key)
{
Evas_Object *ic = it->itc->func.icon_get
- ((void *)it->base.data, it->base.widget, l->data);
+ ((void *)it->base.data, WIDGET(it), l->data);
if (ic)
{
it->edit_icon_objs = eina_list_append(it->edit_icon_objs, ic);
edje_object_part_swallow(it->edit_obj, key, ic);
evas_object_show(ic);
- elm_widget_sub_object_add(it->base.widget, ic);
+ elm_widget_sub_object_add(WIDGET(it), ic);
if (it->disabled)
elm_widget_disabled_set(ic, EINA_TRUE);
}
}
}
}
- edje_object_part_swallow(it->edit_obj, "original_edc", it->base.view);
+ edje_object_part_swallow(it->edit_obj, "original_edc", VIEW(it));
_effect_item_controls(it,it->scrl_x, it->scrl_y);
evas_object_show(it->edit_obj);
edje_object_signal_emit(it->edit_obj, "elm,state,reorder_disable_effect", "elm");
edje_object_signal_emit(it->edit_obj, "elm,state,sel,disable", "elm");
edje_object_message_signal_process(it->edit_obj);
- edje_object_part_unswallow(it->edit_obj, it->base.view);
- evas_object_smart_member_add(it->base.view, it->wd->pan_smart);
- elm_widget_sub_object_add(it->base.widget, it->base.view);
+ edje_object_part_unswallow(it->edit_obj, VIEW(it));
+ evas_object_smart_member_add(VIEW(it), it->wd->pan_smart);
+ elm_widget_sub_object_add(WIDGET(it), VIEW(it));
// evas_object_smart_callback_call(it->edit_obj, "unrealized", it);
// _item_cache_add(it);
evas_object_del(it->edit_obj);
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
return item->renamed;
}
+
+EAPI void
+elm_genlist_item_no_select_mode_set(Elm_Genlist_Item *it,
+ Eina_Bool no_select)
+{
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+ it->no_select = no_select;
+}
+
+EAPI Eina_Bool
+elm_genlist_item_no_select_mode_get(const Elm_Genlist_Item *it)
+{
+ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
+ return it->no_select;
+}
projects / framework / uifw / elementary.git / blobdiff