X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flib%2Felm_gengrid.c;h=8ee50c47ccd1c5a53134ea56bc78f26f71d12c7f;hb=01d0d3d0698d197d1f8445a85b198e9ed20999c9;hp=956104d4dbdceb5f0517857f8f24c96b7fa010f5;hpb=93eb8d63375a1b09fe78a922c72ab4d9ae1c4a2a;p=framework%2Fuifw%2Felementary.git diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index 956104d..8ee50c4 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -4,6 +4,9 @@ #include "els_scroller.h" #include "elm_gen_common.h" +// internally allocated +#define CLASS_ALLOCATED 0x3a70f00f + /* -- * TODO: * Handle non-homogeneous objects too. @@ -24,7 +27,7 @@ struct Elm_Gen_Item_Type { Elm_Gen_Item *it; - Ecore_Animator *item_moving_effect_timer; + Ecore_Animator *item_reorder_move_animator; Evas_Coord gx, gy, ox, oy, tx, ty, rx, ry; unsigned int moving_effect_start_time; int prev_group; @@ -33,54 +36,6 @@ struct Elm_Gen_Item_Type Eina_Bool moving : 1; }; -#if 0 -struct _Widget_Data -{ - Eina_Inlist_Sorted_State *state; - Evas_Object *obj; /* the gengrid object */ - Evas_Object *scr; /* a smart scroller object which is used internally in genlist */ - Evas_Object *pan_smart; /* "elm_genlist_pan" evas smart object. this is an extern pan of smart scroller(scr). */ - Eina_List *selected; - Eina_List *group_items; /* list of groups index items */ - Eina_Inlist *items; /* inlist of all items */ - Elm_Gen_Item *reorder_it; /* item currently being repositioned */ - Elm_Gen_Item *last_selected_item; - Pan *pan; /* pan_smart object's smart data */ - Ecore_Job *calc_job; - int walking; - int item_width, item_height; - int group_item_width, group_item_height; - int minw, minh; - long count; - Evas_Coord pan_x, pan_y; - Eina_Bool reorder_mode : 1; - Eina_Bool on_hold : 1; - Eina_Bool multi : 1; - Eina_Bool no_select : 1; - Eina_Bool wasselected : 1; - Eina_Bool always_select : 1; - Eina_Bool clear_me : 1; - Eina_Bool h_bounce : 1; - Eina_Bool v_bounce : 1; - Ecore_Cb del_cb, calc_cb, sizing_cb; - Ecore_Cb clear_cb; - //////////////////////////////////// - double align_x, align_y; - - Evas_Coord old_pan_x, old_pan_y; - Evas_Coord reorder_item_x, reorder_item_y; - unsigned int nmax; - long items_lost; - - int generation; - - Eina_Bool horizontal : 1; - Eina_Bool longpressed : 1; - Eina_Bool reorder_item_changed : 1; - Eina_Bool move_effect_enabled : 1; -}; -#endif - static const char *widtype = NULL; static void _item_highlight(Elm_Gen_Item *it); static void _item_unrealize_cb(Elm_Gen_Item *it); @@ -129,6 +84,7 @@ 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 char SIG_INDEX_UPDATE[] = "index,update"; static const Evas_Smart_Cb_Description _signals[] = { {SIG_ACTIVATED, ""}, @@ -187,7 +143,8 @@ _event_hook(Evas_Object *obj, elm_smart_scroller_page_size_get(wd->scr, &page_x, &page_y); elm_smart_scroller_child_viewport_size_get(wd->scr, &v_w, &v_h); - if ((!strcmp(ev->keyname, "Left")) || (!strcmp(ev->keyname, "KP_Left"))) + if ((!strcmp(ev->keyname, "Left")) || + ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string))) { if ((wd->horizontal) && (((evas_key_modifier_is_set(ev->modifiers, "Shift")) && @@ -208,7 +165,8 @@ _event_hook(Evas_Object *obj, else x -= step_x; } - else if ((!strcmp(ev->keyname, "Right")) || (!strcmp(ev->keyname, "KP_Right"))) + else if ((!strcmp(ev->keyname, "Right")) || + ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string))) { if ((wd->horizontal) && (((evas_key_modifier_is_set(ev->modifiers, "Shift")) && @@ -229,7 +187,8 @@ _event_hook(Evas_Object *obj, else x += step_x; } - else if ((!strcmp(ev->keyname, "Up")) || (!strcmp(ev->keyname, "KP_Up"))) + else if ((!strcmp(ev->keyname, "Up")) || + ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string))) { if ((wd->horizontal) && (((evas_key_modifier_is_set(ev->modifiers, "Shift")) && @@ -250,7 +209,8 @@ _event_hook(Evas_Object *obj, else y -= step_y; } - else if ((!strcmp(ev->keyname, "Down")) || (!strcmp(ev->keyname, "KP_Down"))) + else if ((!strcmp(ev->keyname, "Down")) || + ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string))) { if ((wd->horizontal) && (((evas_key_modifier_is_set(ev->modifiers, "Shift")) && @@ -271,23 +231,26 @@ _event_hook(Evas_Object *obj, else y += step_y; } - else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home"))) + else if ((!strcmp(ev->keyname, "Home")) || + ((!strcmp(ev->keyname, "KP_Home")) && (!ev->string))) { it = elm_gengrid_first_item_get(obj); - elm_gengrid_item_bring_in(it); + elm_gengrid_item_bring_in(it, ELM_GENGRID_ITEM_SCROLLTO_IN); elm_gengrid_item_selected_set(it, EINA_TRUE); ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; return EINA_TRUE; } - else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End"))) + else if ((!strcmp(ev->keyname, "End")) || + ((!strcmp(ev->keyname, "KP_End")) && (!ev->string))) { it = elm_gengrid_last_item_get(obj); - elm_gengrid_item_bring_in(it); + elm_gengrid_item_bring_in(it, ELM_GENGRID_ITEM_SCROLLTO_IN); elm_gengrid_item_selected_set(it, EINA_TRUE); 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")) && (!ev->string))) { if (wd->horizontal) { @@ -304,7 +267,8 @@ _event_hook(Evas_Object *obj, y -= page_y; } } - else if ((!strcmp(ev->keyname, "Next")) || (!strcmp(ev->keyname, "KP_Next"))) + else if ((!strcmp(ev->keyname, "Next")) || + ((!strcmp(ev->keyname, "KP_Next")) && (!ev->string))) { if (wd->horizontal) { @@ -365,12 +329,12 @@ _item_multi_select_left(Widget_Data *wd) { elm_gengrid_item_selected_set(wd->last_selected_item, EINA_FALSE); wd->last_selected_item = prev; - elm_gengrid_item_show(wd->last_selected_item); + elm_gengrid_item_show(wd->last_selected_item, ELM_GENGRID_ITEM_SCROLLTO_IN); } else { elm_gengrid_item_selected_set(prev, EINA_TRUE); - elm_gengrid_item_show(prev); + elm_gengrid_item_show(prev, ELM_GENGRID_ITEM_SCROLLTO_IN); } return EINA_TRUE; @@ -388,12 +352,12 @@ _item_multi_select_right(Widget_Data *wd) { elm_gengrid_item_selected_set(wd->last_selected_item, EINA_FALSE); wd->last_selected_item = next; - elm_gengrid_item_show(wd->last_selected_item); + elm_gengrid_item_show(wd->last_selected_item, ELM_GENGRID_ITEM_SCROLLTO_IN); } else { elm_gengrid_item_selected_set(next, EINA_TRUE); - elm_gengrid_item_show(next); + elm_gengrid_item_show(next, ELM_GENGRID_ITEM_SCROLLTO_IN); } return EINA_TRUE; @@ -440,7 +404,7 @@ _item_single_select_up(Widget_Data *wd) while ((prev) && (prev->generation < wd->generation)) prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev); elm_gengrid_item_selected_set((Elm_Object_Item *) prev, EINA_TRUE); - elm_gengrid_item_show((Elm_Object_Item *) prev); + elm_gengrid_item_show((Elm_Object_Item *) prev, ELM_GENGRID_ITEM_SCROLLTO_IN); return EINA_TRUE; } else @@ -459,7 +423,7 @@ _item_single_select_up(Widget_Data *wd) _deselect_all_items(wd); elm_gengrid_item_selected_set((Elm_Object_Item *) prev, EINA_TRUE); - elm_gengrid_item_show((Elm_Object_Item *) prev); + elm_gengrid_item_show((Elm_Object_Item *) prev, ELM_GENGRID_ITEM_SCROLLTO_IN); return EINA_TRUE; } @@ -476,7 +440,7 @@ _item_single_select_down(Widget_Data *wd) while ((next) && (next->generation < wd->generation)) next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); elm_gengrid_item_selected_set((Elm_Object_Item *) next, EINA_TRUE); - elm_gengrid_item_show((Elm_Object_Item *) next); + elm_gengrid_item_show((Elm_Object_Item *) next, ELM_GENGRID_ITEM_SCROLLTO_IN); return EINA_TRUE; } else @@ -495,7 +459,7 @@ _item_single_select_down(Widget_Data *wd) _deselect_all_items(wd); elm_gengrid_item_selected_set((Elm_Object_Item *) next, EINA_TRUE); - elm_gengrid_item_show((Elm_Object_Item *) next); + elm_gengrid_item_show((Elm_Object_Item *) next, ELM_GENGRID_ITEM_SCROLLTO_IN); return EINA_TRUE; } @@ -517,7 +481,7 @@ _item_single_select_left(Widget_Data *wd) _deselect_all_items(wd); elm_gengrid_item_selected_set((Elm_Object_Item *) prev, EINA_TRUE); - elm_gengrid_item_show((Elm_Object_Item *) prev); + elm_gengrid_item_show((Elm_Object_Item *) prev, ELM_GENGRID_ITEM_SCROLLTO_IN); return EINA_TRUE; } @@ -539,7 +503,7 @@ _item_single_select_right(Widget_Data *wd) _deselect_all_items(wd); elm_gengrid_item_selected_set((Elm_Object_Item *) next, EINA_TRUE); - elm_gengrid_item_show((Elm_Object_Item *) next); + elm_gengrid_item_show((Elm_Object_Item *) next, ELM_GENGRID_ITEM_SCROLLTO_IN); return EINA_TRUE; } @@ -576,7 +540,7 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl) while (it) { edje_object_mirrored_set(VIEW(it), rtl); - elm_gengrid_item_update((Elm_Object_Item *) it); + elm_gengrid_item_update((Elm_Object_Item *)it); it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next); } } @@ -706,7 +670,7 @@ _mouse_move(void *data, } return; } - if (!it->display_only) + if (it->select_mode != ELM_OBJECT_SELECT_MODE_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; @@ -915,12 +879,24 @@ _mouse_up(void *data, static void _item_highlight(Elm_Gen_Item *it) { - if ((it->wd->no_select) || (it->generation < it->wd->generation) || (it->highlighted)) return; + if ((it->wd->select_mode == ELM_OBJECT_SELECT_MODE_NONE) || + (!it->wd->highlight) || (it->highlighted) || + (it->generation < it->wd->generation)) return; edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm"); it->highlighted = EINA_TRUE; } static void +_elm_gengrid_item_index_update(Elm_Gen_Item *it) +{ + if (it->position_update) + { + evas_object_smart_callback_call(WIDGET(it), SIG_INDEX_UPDATE, it); + it->position_update = EINA_FALSE; + } +} + +static void _item_realize(Elm_Gen_Item *it) { char buf[1024]; @@ -958,7 +934,7 @@ _item_realize(Elm_Gen_Item *it) ((void *)it->base.data, WIDGET(it), key); if (s) { - edje_object_part_text_set(VIEW(it), key, s); + edje_object_part_text_escaped_set(VIEW(it), key, s); free(s); } } @@ -1039,6 +1015,8 @@ _item_realize(Elm_Gen_Item *it) evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MOUSE_MOVE, _mouse_move, it); + _elm_gengrid_item_index_update(it); + if (it->selected) edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm"); if (elm_widget_item_disabled_get(it)) @@ -1072,7 +1050,7 @@ _item_unrealize_cb(Elm_Gen_Item *it) } static Eina_Bool -_reorder_item_moving_effect_timer_cb(void *data) +_reorder_item_move_animator_cb(void *data) { Elm_Gen_Item *it = data; double tt, t; @@ -1110,7 +1088,7 @@ _reorder_item_moving_effect_timer_cb(void *data) else evas_object_resize(VIEW(it), it->wd->item_width, it->wd->item_height); it->item->moving = EINA_FALSE; - it->item->item_moving_effect_timer = NULL; + it->item->item_reorder_move_animator = NULL; return ECORE_CALLBACK_CANCEL; } @@ -1168,8 +1146,8 @@ _group_item_place(Pan *sd) static void _item_place(Elm_Gen_Item *it, - Evas_Coord cx, - Evas_Coord cy) + Evas_Coord cx, + Evas_Coord cy) { Evas_Coord x, y, ox, oy, cvx, cvy, cvw, cvh, iw, ih, ww; Evas_Coord tch, tcw, alignw = 0, alignh = 0, vw, vh; @@ -1345,7 +1323,7 @@ _item_place(Elm_Gen_Item *it, it->item->ry = it->item->oy; it->item->moving = EINA_TRUE; it->item->moving_effect_start_time = ecore_loop_time_get(); - it->item->item_moving_effect_timer = ecore_animator_add(_reorder_item_moving_effect_timer_cb, it); + it->item->item_reorder_move_animator = ecore_animator_add(_reorder_item_move_animator_cb, it); return; } } @@ -1415,10 +1393,10 @@ _item_place(Elm_Gen_Item *it, } } } - else if (it->item->item_moving_effect_timer) + else if (it->item->item_reorder_move_animator) { - ecore_animator_del(it->item->item_moving_effect_timer); - it->item->item_moving_effect_timer = NULL; + ecore_animator_del(it->item->item_reorder_move_animator); + it->item->item_reorder_move_animator = NULL; it->item->moving = EINA_FALSE; } } @@ -1440,6 +1418,18 @@ _item_place(Elm_Gen_Item *it, } static void +_item_position_update(Eina_Inlist *list, int idx) +{ + Elm_Gen_Item *it; + + EINA_INLIST_FOREACH(list, it) + { + it->position = idx++; + it->position_update = EINA_TRUE; + } +} + +static void _item_del(Elm_Gen_Item *it) { Evas_Object *obj = WIDGET(it); @@ -1447,7 +1437,6 @@ _item_del(Elm_Gen_Item *it) evas_event_freeze(evas_object_evas_get(obj)); it->wd->selected = eina_list_remove(it->wd->selected, it); if (it->realized) _elm_genlist_item_unrealize(it, EINA_FALSE); - it->wd->item_count--; _elm_genlist_item_del_serious(it); elm_gengrid_item_class_unref((Elm_Gengrid_Item_Class *)it->itc); evas_event_thaw(evas_object_evas_get(obj)); @@ -1726,9 +1715,9 @@ _pan_move(Evas_Object *obj, } static void -_hold_on(void *data __UNUSED__, - Evas_Object *obj, - void *event_info __UNUSED__) +_hold_on(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -1736,9 +1725,9 @@ _hold_on(void *data __UNUSED__, } static void -_hold_off(void *data __UNUSED__, - Evas_Object *obj, - void *event_info __UNUSED__) +_hold_off(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -1746,9 +1735,9 @@ _hold_off(void *data __UNUSED__, } static void -_freeze_on(void *data __UNUSED__, - Evas_Object *obj, - void *event_info __UNUSED__) +_freeze_on(void *data __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -1775,8 +1764,8 @@ _scr_anim_start(void *data, static void _scr_anim_stop(void *data, - Evas_Object *obj __UNUSED__, - void *event_info __UNUSED__) + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_STOP, NULL); } @@ -1849,7 +1838,7 @@ _elm_gengrid_item_compare(const void *data, const void *data1) static void _item_disable_hook(Elm_Object_Item *it) { - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if (_it->generation < _it->wd->generation) return; @@ -1865,7 +1854,7 @@ _item_disable_hook(Elm_Object_Item *it) static void _item_del_pre_hook(Elm_Object_Item *it) { - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if ((_it->relcount > 0) || (_it->walking > 0)) { _elm_genlist_item_del_notserious(_it); @@ -1964,6 +1953,7 @@ elm_gengrid_add(Evas_Object *parent) wd->align_y = 0.5; wd->h_bounce = bounce; wd->v_bounce = bounce; + wd->highlight = EINA_TRUE; evas_object_smart_callback_add(obj, "scroll-hold-on", _hold_on, obj); evas_object_smart_callback_add(obj, "scroll-hold-off", _hold_off, obj); @@ -2013,8 +2003,8 @@ elm_gengrid_item_size_get(const Evas_Object *obj, EAPI void elm_gengrid_group_item_size_set(Evas_Object *obj, - Evas_Coord w, - Evas_Coord h) + Evas_Coord w, + Evas_Coord h) { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); @@ -2028,8 +2018,8 @@ elm_gengrid_group_item_size_set(Evas_Object *obj, EAPI void elm_gengrid_group_item_size_get(const Evas_Object *obj, - Evas_Coord *w, - Evas_Coord *h) + Evas_Coord *w, + Evas_Coord *h) { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); @@ -2090,6 +2080,8 @@ elm_gengrid_item_append(Evas_Object *obj, it = _item_new(wd, itc, data, func, func_data); if (!it) return NULL; wd->items = eina_inlist_append(wd->items, EINA_INLIST_GET(it)); + it->position = eina_inlist_count(wd->items); + it->position_update = EINA_TRUE; if (it->group) wd->group_items = eina_list_prepend(wd->group_items, it); @@ -2097,7 +2089,7 @@ elm_gengrid_item_append(Evas_Object *obj, if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -2115,13 +2107,15 @@ elm_gengrid_item_prepend(Evas_Object *obj, it = _item_new(wd, itc, data, func, func_data); if (!it) return NULL; wd->items = eina_inlist_prepend(wd->items, EINA_INLIST_GET(it)); + _item_position_update(wd->items, 0); + if (it->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 (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -2142,13 +2136,16 @@ elm_gengrid_item_insert_before(Evas_Object *obj, if (!it) return NULL; wd->items = eina_inlist_prepend_relative (wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET((Elm_Gen_Item *) relative)); + Eina_Inlist *tmp = eina_inlist_find(wd->items, EINA_INLIST_GET(it)); + _item_position_update(tmp, ((Elm_Gen_Item *)relative)->position); + if (it->group) wd->group_items = eina_list_append_relative(wd->group_items, it, ((Elm_Gen_Item *) relative)->parent); if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -2169,13 +2166,16 @@ elm_gengrid_item_insert_after(Evas_Object *obj, if (!it) return NULL; wd->items = eina_inlist_append_relative (wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET((Elm_Gen_Item *) relative)); + Eina_Inlist *tmp = eina_inlist_find(wd->items, EINA_INLIST_GET(it)); + _item_position_update(tmp, ((Elm_Gen_Item *)relative)->position+1); + if (it->group) wd->group_items = eina_list_prepend_relative(wd->group_items, it, ((Elm_Gen_Item *) relative)->parent); if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -2200,27 +2200,12 @@ elm_gengrid_item_sorted_insert(Evas_Object *obj, wd->item_compare_cb = comp; wd->items = eina_inlist_sorted_state_insert(wd->items, EINA_INLIST_GET(it), _elm_gengrid_item_compare, wd->state); + _item_position_update(wd->items, 0); + if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); - return (Elm_Object_Item *) it; -} - -EINA_DEPRECATED Elm_Object_Item * -elm_gengrid_item_direct_sorted_insert(Evas_Object *obj, - const Elm_Gengrid_Item_Class *itc, - const void *data, - Eina_Compare_Cb comp, - Evas_Smart_Cb func, - const void *func_data) -{ - return elm_gengrid_item_sorted_insert(obj, itc, data, comp, func, func_data); -} - -EAPI void -elm_gengrid_item_del(Elm_Object_Item *it) -{ - elm_object_item_del(it); + return (Elm_Object_Item *)it; } EAPI void @@ -2265,7 +2250,7 @@ EAPI void elm_gengrid_item_update(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if (!_it->realized) return; if (_it->want_unrealize) return; _elm_genlist_item_unrealize(_it, EINA_FALSE); @@ -2273,30 +2258,10 @@ elm_gengrid_item_update(Elm_Object_Item *it) _item_place(_it, _it->x, _it->y); } -EAPI void * -elm_gengrid_item_data_get(const Elm_Object_Item *it) -{ - return elm_object_item_data_get(it); -} - -EAPI void -elm_gengrid_item_data_set(Elm_Object_Item *it, - const void *data) -{ - elm_object_item_data_set(it, (void *) data); -} - EAPI const Elm_Gengrid_Item_Class * elm_gengrid_item_item_class_get(const Elm_Object_Item *it) { - return (Elm_Gengrid_Item_Class *) elm_genlist_item_item_class_get(it); -} - -EINA_DEPRECATED EAPI void -elm_gengrid_item_item_class_set(Elm_Object_Item *it, - const Elm_Gengrid_Item_Class *itc) -{ - elm_gengrid_item_item_class_update(it, itc); + return (Elm_Gengrid_Item_Class *)elm_genlist_item_item_class_get(it); } EAPI void @@ -2305,7 +2270,7 @@ elm_gengrid_item_item_class_update(Elm_Object_Item *it, { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); EINA_SAFETY_ON_NULL_RETURN(itc); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if (_it->generation < _it->wd->generation) return; _it->itc = itc; elm_gengrid_item_update(it); @@ -2317,8 +2282,8 @@ elm_gengrid_item_pos_get(const Elm_Object_Item *it, unsigned int *y) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - if (x) *x = ((Elm_Gen_Item *) it)->x; - if (y) *y = ((Elm_Gen_Item *) it)->y; + if (x) *x = ((Elm_Gen_Item *)it)->x; + if (y) *y = ((Elm_Gen_Item *)it)->y; } EAPI void @@ -2369,17 +2334,32 @@ elm_gengrid_item_selected_get(const Elm_Object_Item *it) return elm_genlist_item_selected_get(it); } -EAPI void -elm_gengrid_item_disabled_set(Elm_Object_Item *it, - Eina_Bool disabled) +EAPI Eina_List * +elm_gengrid_realized_items_get(const Evas_Object *obj) { - elm_object_item_disabled_set(it, disabled); + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd = elm_widget_data_get(obj); + Eina_List *list = NULL; + Elm_Gen_Item *it; + + EINA_INLIST_FOREACH(wd->items, it) + { + if (it->realized) list = eina_list_append(list, (Elm_Object_Item *)it); + } + return list; } -EAPI Eina_Bool -elm_gengrid_item_disabled_get(const Elm_Object_Item *it) +EAPI void +elm_gengrid_realized_items_update(Evas_Object *obj) { - return elm_object_item_disabled_get(it); + ELM_CHECK_WIDTYPE(obj, widtype); + + Eina_List *list, *l; + Elm_Object_Item *it; + + list = elm_gengrid_realized_items_get(obj); + EINA_LIST_FOREACH(list, l, it) + elm_gengrid_item_update(it); } static Evas_Object * @@ -2422,7 +2402,7 @@ elm_gengrid_item_tooltip_content_cb_set(Elm_Object_Item *it, Evas_Smart_Cb del_cb) { ELM_OBJ_ITEM_CHECK_OR_GOTO(it, error); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if ((_it->tooltip.content_cb == func) && (_it->tooltip.data == data)) return; @@ -2451,7 +2431,7 @@ EAPI void elm_gengrid_item_tooltip_unset(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if ((VIEW(_it)) && (_it->tooltip.content_cb)) elm_widget_item_tooltip_unset(_it); @@ -2471,7 +2451,7 @@ elm_gengrid_item_tooltip_style_set(Elm_Object_Item *it, const char *style) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - eina_stringshare_replace(&((Elm_Gen_Item *) it)->tooltip.style, style); + eina_stringshare_replace(&((Elm_Gen_Item *)it)->tooltip.style, style); if (VIEW(it)) elm_widget_item_tooltip_style_set(it, style); } @@ -2479,14 +2459,14 @@ EAPI const char * elm_gengrid_item_tooltip_style_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - return ((Elm_Gen_Item *) it)->tooltip.style; + return ((Elm_Gen_Item *)it)->tooltip.style; } EAPI Eina_Bool elm_gengrid_item_tooltip_window_mode_set(Elm_Object_Item *it, Eina_Bool disable) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); - ((Elm_Gen_Item *) it)->tooltip.free_size = disable; + ((Elm_Gen_Item *)it)->tooltip.free_size = disable; if (VIEW(it)) return elm_widget_item_tooltip_window_mode_set(it, disable); return EINA_TRUE; } @@ -2495,7 +2475,7 @@ EAPI Eina_Bool elm_gengrid_item_tooltip_window_mode_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); - return ((Elm_Gen_Item *) it)->tooltip.free_size; + return ((Elm_Gen_Item *)it)->tooltip.free_size; } EAPI void @@ -2503,7 +2483,7 @@ elm_gengrid_item_cursor_set(Elm_Object_Item *it, const char *cursor) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - eina_stringshare_replace(&((Elm_Gen_Item *) it)->mouse_cursor, cursor); + eina_stringshare_replace(&((Elm_Gen_Item *)it)->mouse_cursor, cursor); if (VIEW(it)) elm_widget_item_cursor_set(it, cursor); } @@ -2517,7 +2497,7 @@ EAPI void elm_gengrid_item_cursor_unset(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if (!_it->mouse_cursor) return; @@ -2574,32 +2554,6 @@ elm_gengrid_reorder_mode_get(const Evas_Object *obj) } EAPI void -elm_gengrid_always_select_mode_set(Evas_Object *obj, - Eina_Bool always_select) -{ - elm_genlist_always_select_mode_set(obj, always_select); -} - -EAPI Eina_Bool -elm_gengrid_always_select_mode_get(const Evas_Object *obj) -{ - return elm_genlist_always_select_mode_get(obj); -} - -EAPI void -elm_gengrid_no_select_mode_set(Evas_Object *obj, - Eina_Bool no_select) -{ - elm_genlist_no_select_mode_set(obj, no_select); -} - -EAPI Eina_Bool -elm_gengrid_no_select_mode_get(const Evas_Object *obj) -{ - return elm_genlist_no_select_mode_get(obj); -} - -EAPI void elm_gengrid_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce) @@ -2661,6 +2615,34 @@ elm_gengrid_page_bring_in(const Evas_Object *obj, int h_pagenumber, int v_pagenu _elm_genlist_page_bring_in(obj, h_pagenumber, v_pagenumber); } +EAPI void +elm_gengrid_scroller_policy_set(Evas_Object *obj, + Elm_Scroller_Policy policy_h, + Elm_Scroller_Policy policy_v) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if ((!wd) || (!wd->scr)) return; + if ((policy_h >= ELM_SCROLLER_POLICY_LAST) || + (policy_v >= ELM_SCROLLER_POLICY_LAST)) + return; + elm_smart_scroller_policy_set(wd->scr, policy_h, policy_v); +} + +EAPI void +elm_gengrid_scroller_policy_get(const Evas_Object *obj, + Elm_Scroller_Policy *policy_h, + Elm_Scroller_Policy *policy_v) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + Elm_Smart_Scroller_Policy s_policy_h, s_policy_v; + if ((!wd) || (!wd->scr)) return; + elm_smart_scroller_policy_get(wd->scr, &s_policy_h, &s_policy_v); + if (policy_h) *policy_h = (Elm_Scroller_Policy)s_policy_h; + if (policy_v) *policy_v = (Elm_Scroller_Policy)s_policy_v; +} + EAPI Elm_Object_Item * elm_gengrid_first_item_get(const Evas_Object *obj) { @@ -2685,23 +2667,22 @@ elm_gengrid_item_prev_get(const Elm_Object_Item *it) return elm_genlist_item_prev_get(it); } -EAPI Evas_Object * -elm_gengrid_item_gengrid_get(const Elm_Object_Item *it) -{ - return elm_object_item_widget_get(it); -} - EAPI void -elm_gengrid_item_show(Elm_Object_Item *it) +elm_gengrid_item_show(Elm_Object_Item *it, Elm_Gengrid_Item_Scrollto_Type type) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; Widget_Data *wd = _it->wd; Evas_Coord minx = 0, miny = 0; if ((_it->generation < _it->wd->generation)) return; _pan_min_get(wd->pan_smart, &minx, &miny); + if (type==ELM_GENGRID_ITEM_SCROLLTO_IN) + { + //TODO : type based handling like genlist + } + if (wd->horizontal) elm_smart_scroller_region_bring_in(_it->wd->scr, ((_it->x - _it->item->prev_group) * wd->item_width) + (_it->item->prev_group * _it->wd->group_item_width) + minx, @@ -2717,10 +2698,10 @@ elm_gengrid_item_show(Elm_Object_Item *it) } EAPI void -elm_gengrid_item_bring_in(Elm_Object_Item *it) +elm_gengrid_item_bring_in(Elm_Object_Item *it, Elm_Gengrid_Item_Scrollto_Type type) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if (_it->generation < _it->wd->generation) return; @@ -2728,6 +2709,11 @@ elm_gengrid_item_bring_in(Elm_Object_Item *it) Widget_Data *wd = _it->wd; _pan_min_get(wd->pan_smart, &minx, &miny); + if (type==ELM_GENGRID_ITEM_SCROLLTO_IN) + { + //TODO : type based handling like genlist + } + if (wd->horizontal) elm_smart_scroller_region_bring_in(_it->wd->scr, ((_it->x - _it->item->prev_group) * wd->item_width) + (_it->item->prev_group * _it->wd->group_item_width) + minx, @@ -2762,6 +2748,15 @@ elm_gengrid_filled_get(const Evas_Object *obj) return wd->filled; } +EAPI unsigned int +elm_gengrid_items_count(const Evas_Object *obj) +{ + ELM_CHECK_WIDTYPE(obj, widtype) 0; + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return 0; + return wd->item_count; +} + EAPI Elm_Gengrid_Item_Class * elm_gengrid_item_class_new(void) { @@ -2770,7 +2765,7 @@ elm_gengrid_item_class_new(void) itc = calloc(1, sizeof(Elm_Gengrid_Item_Class)); if (!itc) return NULL; - itc->version = ELM_GENGRID_ITEM_CLASS_VERSION; + itc->version = CLASS_ALLOCATED; itc->refcount = 1; itc->delete_me = EINA_FALSE; @@ -2780,7 +2775,7 @@ elm_gengrid_item_class_new(void) EAPI void elm_gengrid_item_class_free(Elm_Gengrid_Item_Class *itc) { - if (itc && (itc->version == ELM_GENGRID_ITEM_CLASS_VERSION)) + if (itc && (itc->version == CLASS_ALLOCATED)) { if (!itc->delete_me) itc->delete_me = EINA_TRUE; if (itc->refcount > 0) elm_gengrid_item_class_unref(itc); @@ -2795,7 +2790,7 @@ elm_gengrid_item_class_free(Elm_Gengrid_Item_Class *itc) EAPI void elm_gengrid_item_class_ref(Elm_Gengrid_Item_Class *itc) { - if (itc && (itc->version == ELM_GENGRID_ITEM_CLASS_VERSION)) + if (itc && (itc->version == CLASS_ALLOCATED)) { itc->refcount++; if (itc->refcount == 0) itc->refcount--; @@ -2805,7 +2800,7 @@ elm_gengrid_item_class_ref(Elm_Gengrid_Item_Class *itc) EAPI void elm_gengrid_item_class_unref(Elm_Gengrid_Item_Class *itc) { - if (itc && (itc->version == ELM_GENGRID_ITEM_CLASS_VERSION)) + if (itc && (itc->version == CLASS_ALLOCATED)) { if (itc->refcount > 0) itc->refcount--; if (itc->delete_me && (!itc->refcount)) @@ -2813,3 +2808,62 @@ elm_gengrid_item_class_unref(Elm_Gengrid_Item_Class *itc) } } +EAPI void +elm_gengrid_select_mode_set(Evas_Object *obj, Elm_Object_Select_Mode mode) +{ + elm_genlist_select_mode_set(obj, mode); +} + +EAPI Elm_Object_Select_Mode +elm_gengrid_select_mode_get(const Evas_Object *obj) +{ + return elm_genlist_select_mode_get(obj); +} + +EAPI void +elm_gengrid_highlight_mode_set(Evas_Object *obj, + Eina_Bool highlight) +{ + elm_genlist_highlight_mode_set(obj, highlight); +} + +EAPI Eina_Bool +elm_gengrid_highlight_mode_get(const Evas_Object *obj) +{ + return elm_genlist_highlight_mode_get(obj); +} + +EAPI int +elm_gengrid_item_index_get(const Elm_Object_Item *it) +{ + ELM_OBJ_ITEM_CHECK_OR_RETURN(it, -1); + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; + + return _it->position; +} + +EAPI void +elm_gengrid_item_select_mode_set(Elm_Object_Item *it, + Elm_Object_Select_Mode mode) +{ + ELM_OBJ_ITEM_CHECK_OR_RETURN(it); + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; + if (!_it) return; + if (_it->generation < _it->wd->generation) return; + if (mode >= ELM_OBJECT_SELECT_MODE_MAX) + return; + if (_it->select_mode != mode) + _it->select_mode = mode; + + if (_it->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY) + elm_gengrid_item_update(it); +} + +EAPI Elm_Object_Select_Mode +elm_gengrid_item_select_mode_get(const Elm_Object_Item *it) +{ + ELM_OBJ_ITEM_CHECK_OR_RETURN(it, ELM_OBJECT_SELECT_MODE_MAX); + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; + if (!_it) return ELM_OBJECT_SELECT_MODE_MAX; + return _it->select_mode; +}