X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flib%2Felm_diskselector.c;h=c2b5ff08642688e627876807e2799b431b635a7f;hb=49948ead683ed56c77b3f7e8cf7aff83cfc54b8e;hp=8713c828767ff591b0aafa2ebc7aa2d5fe60b75c;hpb=fdfe0c7808012ddd5a1311f8324bf558be824087;p=framework%2Fuifw%2Felementary.git diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c index 8713c82..c2b5ff0 100644 --- a/src/lib/elm_diskselector.c +++ b/src/lib/elm_diskselector.c @@ -1,20 +1,6 @@ -/** - * @defgroup Diskselector - * - * A diskselector is a kind of list widget. It scrolls horizontally, - * and can contain label and icon objects. Three items are displayed - * with the selected on the middle. - * - * It can act like a circular list with round mode and labels can be - * reduced for a defined length for side items. - * - * Signals that you can add callbacks for are: - * - * "selected" - when item is selected (scroller stops) - */ - #include #include "elm_priv.h" +#include "els_scroller.h" #ifndef MAX # define MAX(a, b) (((a) > (b)) ? (a) : (b)) @@ -27,6 +13,7 @@ #define DISPLAY_ITEM_NUM_MIN 3 typedef struct _Widget_Data Widget_Data; +typedef struct _Elm_Diskselector_Item Elm_Diskselector_Item; struct _Widget_Data { @@ -45,8 +32,8 @@ struct _Widget_Data Eina_List *over_items; Eina_List *under_items; int item_count, len_threshold, len_side, display_item_num; - Ecore_Idler *idler; - Ecore_Idler *check_idler; + Ecore_Idle_Enterer *idler; + Ecore_Idle_Enterer *check_idler; Evas_Coord minw, minh; Eina_Bool init:1; Eina_Bool round:1; @@ -55,7 +42,7 @@ struct _Widget_Data struct _Elm_Diskselector_Item { - Elm_Widget_Item base; + ELM_WIDGET_ITEM; Eina_List *node; Evas_Object *icon; const char *label; @@ -64,10 +51,6 @@ struct _Elm_Diskselector_Item static const char *widtype = NULL; -#define ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, ...) \ - ELM_WIDGET_ITEM_CHECK_OR_RETURN((Elm_Widget_Item *)it, __VA_ARGS__); \ - ELM_CHECK_WIDTYPE(it->base.widget, widtype) __VA_ARGS__; - static Eina_Bool _move_scroller(void *data); static void _del_hook(Evas_Object * obj); static void _del_pre_hook(Evas_Object * obj); @@ -82,10 +65,29 @@ static void _item_click_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__); static void _selected_item_indicate(Elm_Diskselector_Item *it); +static void _item_text_set_hook(Elm_Object_Item *it, + const char *part, + const char *label); +static const char * _item_text_get_hook(const Elm_Object_Item *it, + const char *part); +static void _item_content_set_hook(Elm_Object_Item *it, + const char *part, + Evas_Object *content); +static Evas_Object * _item_content_get_hook(const Elm_Object_Item *it, + const char *part); static const char SIG_SELECTED[] = "selected"; +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 Evas_Smart_Cb_Description _signals[] = { {SIG_SELECTED, ""}, + {SIG_SCROLL_ANIM_START, ""}, + {SIG_SCROLL_ANIM_STOP, ""}, + {SIG_SCROLL_DRAG_START, ""}, + {SIG_SCROLL_DRAG_STOP, ""}, {NULL, NULL} }; @@ -98,9 +100,11 @@ _diskselector_object_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, vo wd = elm_widget_data_get(data); if (!wd) return; - if (wd->minw == -1 && wd->minh == -1) elm_coords_finger_size_adjust(6, &wd->minw, 1, &wd->minh); - edje_object_size_min_restricted_calc(elm_smart_scroller_edje_object_get( - wd->scroller), &wd->minw, &wd->minh, wd->minw, wd->minh); + if ((wd->minw == -1) && (wd->minh == -1)) + elm_coords_finger_size_adjust(6, &wd->minw, 1, &wd->minh); + edje_object_size_min_restricted_calc + (elm_smart_scroller_edje_object_get + (wd->scroller), &wd->minw, &wd->minh, wd->minw, wd->minh); evas_object_size_hint_min_set(obj, wd->minw, wd->minh); evas_object_size_hint_max_set(obj, -1, -1); @@ -114,7 +118,224 @@ _diskselector_object_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, vo (int)(w / wd->display_item_num), 0); if (!wd->idler) - wd->idler = ecore_idler_add(_move_scroller, data); + wd->idler = ecore_idle_enterer_before_add(_move_scroller, data); +} + +static void +_item_del(Elm_Diskselector_Item *item) +{ + if (!item) return; + eina_stringshare_del(item->label); + if (item->icon) + evas_object_del(item->icon); +} + +static int +_count_letter(const char *str) +{ + int pos = 0; + int code = 0, chnum; + + for (chnum = 0; ; chnum++) + { + pos = evas_string_char_next_get(str, pos, &code); + if (code == 0) break; + } + return chnum; +} + +static int +_check_letter(const char *str, int length) +{ + int pos = 0; + int code = 0, chnum; + + for (chnum = 0; ; chnum++) + { + if (chnum == length) break; + pos = evas_string_char_next_get(str, pos, &code); + if (code == 0) break; + } + return pos; +} + +static Eina_Bool +_check_string(void *data) +{ + int mid, steps, length, diff; + Elm_Diskselector_Item *it; + Eina_List *list, *l; + Evas_Coord ox, ow; + char buf[1024]; + Widget_Data *wd = data; + + evas_object_geometry_get(wd->scroller, &ox, NULL, &ow, NULL); + if (ow <= 0) + return EINA_FALSE; + if (!wd->init) + return EINA_FALSE; + if (!wd->round) + list = wd->items; + else + list = wd->r_items; + + EINA_LIST_FOREACH(list, l, it) + { + Evas_Coord x, w; + int len; + evas_object_geometry_get(VIEW(it), &x, NULL, &w, NULL); + /* item not visible */ + if ((x + w <= ox) || (x >= ox + ow)) + continue; + + len = _count_letter(it->label); +// // FIXME: len should be # of ut8f letters. ie count using utf8 string walk, not stringshare len +// len = eina_stringshare_strlen(it->label); + + if (x <= ox + 5) + edje_object_signal_emit(VIEW(it), "elm,state,left_side", + "elm"); + else if (x + w >= ox + ow - 5) + edje_object_signal_emit(VIEW(it), "elm,state,right_side", + "elm"); + else + { + if ((wd->len_threshold) && (len > wd->len_threshold)) + edje_object_signal_emit(VIEW(it), "elm,state,center_small", + "elm"); + else + edje_object_signal_emit(VIEW(it), "elm,state,center", + "elm"); + } + + // if len is les that the limit len, skip anyway + if (len <= wd->len_side) + continue; + + steps = len - wd->len_side + 1; + mid = x + w / 2; + if (mid <= ox + ow / 2) + diff = (ox + ow / 2) - mid; + else + diff = mid - (ox + ow / 2); + + length = len - (int)(diff * steps / (ow / 3)); + length = MAX(length, wd->len_side); + // limit string len to "length" ut8f chars + length = _check_letter(it->label, length); + // cut it off at byte mark returned form _check_letter + strncpy(buf, it->label, length); + buf[length] = '\0'; + edje_object_part_text_escaped_set(VIEW(it), "elm.text", buf); + } + + if (wd->check_idler) + ecore_idle_enterer_del(wd->check_idler); + wd->check_idler = NULL; + return EINA_FALSE; +} + +static Eina_Bool +_item_del_pre_hook(Elm_Object_Item *it) +{ + Elm_Diskselector_Item *item, *item2, *dit; + Eina_List *l; + int i = 0; + Widget_Data *wd; + item = (Elm_Diskselector_Item *)it; + wd = elm_widget_data_get(WIDGET(item)); + if (!wd) return EINA_FALSE; + + elm_box_unpack(wd->main_box, VIEW(item)); + + if (wd->round) + wd->r_items = eina_list_remove(wd->r_items, item); + + wd->items = eina_list_remove(wd->items, item); + + if (wd->selected_item == item) + { + dit = (Elm_Diskselector_Item *) eina_list_nth(wd->items, 0); + if (dit != item) + wd->selected_item = dit; + else + wd->selected_item = eina_list_nth(wd->items, 1); + + _selected_item_indicate(wd->selected_item); + } + + _item_del(item); + wd->item_count -= 1; + + if (wd->round) + { + if (!wd->item_count) + { + evas_object_hide(wd->VIEW(first)); + evas_object_hide(wd->VIEW(second)); + evas_object_hide(wd->VIEW(last)); + evas_object_hide(wd->VIEW(s_last)); + + EINA_LIST_FOREACH(wd->under_items, l, item2) + evas_object_hide(VIEW(item2)); + + EINA_LIST_FOREACH(wd->over_items, l, item2) + evas_object_hide(VIEW(item2)); + } + else + { + dit = eina_list_nth(wd->items, 0); + if (dit) + { + eina_stringshare_replace(&wd->first->label, dit->label); + edje_object_part_text_escaped_set(wd->VIEW(first), "elm.text", + wd->first->label); + } + dit = eina_list_nth(wd->items, 1); + if (dit) + { + eina_stringshare_replace(&wd->second->label, dit->label); + edje_object_part_text_escaped_set(wd->VIEW(second), "elm.text", + wd->second->label); + } + // if more than 3 itmes should be displayed + for (i = 2; i < CEIL(wd->display_item_num); i++) + { + dit = eina_list_nth(wd->items, i); + item2 = eina_list_nth(wd->over_items, i - 2); + eina_stringshare_replace(&item2->label, dit->label); + edje_object_part_text_escaped_set(VIEW(item2), "elm.text", item2->label); + } + + dit = eina_list_nth(wd->items, eina_list_count(wd->items) - 1); + if (dit) + { + eina_stringshare_replace(&wd->last->label, dit->label); + edje_object_part_text_escaped_set(wd->VIEW(last), "elm.text", + wd->last->label); + } + dit = eina_list_nth(wd->items, eina_list_count(wd->items) - 2); + if (dit) + { + eina_stringshare_replace(&wd->s_last->label, dit->label); + edje_object_part_text_escaped_set(wd->VIEW(s_last), "elm.text", + wd->s_last->label); + } + // if more than 3 itmes should be displayed + for (i = 3; i <= CEIL(wd->display_item_num); i++) + { + dit = eina_list_nth(wd->items, wd->item_count - i); + item2 = eina_list_nth(wd->under_items, i - 3); + eina_stringshare_replace(&item2->label, dit->label); + edje_object_part_text_escaped_set(VIEW(item2), "elm.text", + item2->label); + } + } + } + wd->check_idler = ecore_idle_enterer_before_add(_check_string, wd); + _sizing_eval(wd->self); + + return EINA_TRUE; } static Elm_Diskselector_Item * @@ -126,28 +347,34 @@ _item_new(Evas_Object *obj, Evas_Object *icon, const char *label, Evas_Smart_Cb it = elm_widget_item_new(obj, Elm_Diskselector_Item); if (!it) return NULL; + elm_widget_item_del_pre_hook_set(it, _item_del_pre_hook); + elm_widget_item_text_set_hook_set(it, _item_text_set_hook); + elm_widget_item_text_get_hook_set(it, _item_text_get_hook); + elm_widget_item_content_set_hook_set(it, _item_content_set_hook); + elm_widget_item_content_get_hook_set(it, _item_content_get_hook); + it->label = eina_stringshare_add(label); it->icon = icon; it->func = func; it->base.data = data; - it->base.view = edje_object_add(evas_object_evas_get(obj)); - _elm_theme_object_set(obj, it->base.view, "diskselector", "item", style); - evas_object_size_hint_weight_set(it->base.view, EVAS_HINT_EXPAND, + VIEW(it) = edje_object_add(evas_object_evas_get(obj)); + _elm_theme_object_set(obj, VIEW(it), "diskselector", "item", style); + evas_object_size_hint_weight_set(VIEW(it), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(it->base.view, EVAS_HINT_FILL, + evas_object_size_hint_align_set(VIEW(it), EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(it->base.view); + evas_object_show(VIEW(it)); if (it->label) { - edje_object_part_text_set(it->base.view, "elm.text", it->label); - edje_object_signal_callback_add(it->base.view, "elm,action,click", "", _item_click_cb, it); + edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label); + edje_object_signal_callback_add(VIEW(it), "elm,action,click", "", _item_click_cb, it); } if (it->icon) { evas_object_size_hint_min_set(it->icon, 24, 24); evas_object_size_hint_max_set(it->icon, 40, 40); - edje_object_part_swallow(it->base.view, "elm.swallow.icon", it->icon); + edje_object_part_swallow(VIEW(it), "elm.swallow.icon", it->icon); evas_object_show(it->icon); elm_widget_sub_object_add(obj, it->icon); } @@ -155,16 +382,6 @@ _item_new(Evas_Object *obj, Evas_Object *icon, const char *label, Evas_Smart_Cb } static void -_item_del(Elm_Diskselector_Item *item) -{ - if (!item) return; - eina_stringshare_del(item->label); - if (item->icon) - evas_object_del(item->icon); - elm_widget_item_del(item); -} - -static void _theme_data_get(Widget_Data *wd) { const char* str; @@ -181,7 +398,7 @@ _theme_data_get(Widget_Data *wd) } str = edje_object_data_get(wd->right_blank, "min_width"); - if (str) wd->minw = MAX(-1, atoi(str)); + if (str) wd->minw = MAX(-1, atoi(str)) * elm_scale_get(); else { parent = elm_widget_parent_widget_get(wd->self); @@ -190,24 +407,20 @@ _theme_data_get(Widget_Data *wd) } str = edje_object_data_get(wd->right_blank, "min_height"); - if (str) wd->minh = MAX(-1, atoi(str)); + if (str) wd->minh = MAX(-1, atoi(str)) * elm_scale_get(); else wd->minh = -1; } static void -_default_display_item_num_set(Widget_Data *wd) -{ - const char* str; - str = edje_object_data_get(wd->right_blank, "display_item_num"); - if (str) wd->display_item_num = MAX(DISPLAY_ITEM_NUM_MIN, atoi(str)); - else wd->display_item_num = DISPLAY_ITEM_NUM_MIN; -} - -static void _del_hook(Evas_Object * obj) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; + if (wd->idler) + { + ecore_idle_enterer_del(wd->idler); + wd->idler = NULL; + } free(wd); } @@ -227,25 +440,25 @@ _del_pre_hook(Evas_Object * obj) if (wd->last) { eina_stringshare_del(wd->last->label); - evas_object_del(wd->last->base.view); + evas_object_del(wd->VIEW(last)); free(wd->last); } if (wd->s_last) { eina_stringshare_del(wd->s_last->label); - evas_object_del(wd->s_last->base.view); + evas_object_del(wd->VIEW(s_last)); free(wd->s_last); } if (wd->second) { eina_stringshare_del(wd->second->label); - evas_object_del(wd->second->base.view); + evas_object_del(wd->VIEW(second)); free(wd->second); } if (wd->first) { eina_stringshare_del(wd->first->label); - evas_object_del(wd->first->base.view); + evas_object_del(wd->VIEW(first)); free(wd->first); } @@ -254,7 +467,7 @@ _del_pre_hook(Evas_Object * obj) if (it) { eina_stringshare_del(it->label); - evas_object_del(wd->first->base.view); + evas_object_del(VIEW(it)); free(it); } } @@ -264,12 +477,16 @@ _del_pre_hook(Evas_Object * obj) if (it) { eina_stringshare_del(it->label); - evas_object_del(wd->first->base.view); + evas_object_del(VIEW(it)); free(it); } } - EINA_LIST_FREE(wd->items, it) _item_del(it); + EINA_LIST_FREE(wd->items, it) + { + _item_del(it); + elm_widget_item_free(it); + } eina_list_free(wd->r_items); } @@ -296,18 +513,18 @@ _theme_hook(Evas_Object * obj) { EINA_LIST_FOREACH(wd->r_items, l, it) { - _elm_theme_object_set(obj, it->base.view, "diskselector", "item", + _elm_theme_object_set(obj, VIEW(it), "diskselector", "item", elm_widget_style_get(obj)); - edje_object_part_text_set(it->base.view, "elm.text", it->label); + edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label); } } else { EINA_LIST_FOREACH(wd->items, l, it) { - _elm_theme_object_set(obj, it->base.view, "diskselector", "item", + _elm_theme_object_set(obj, VIEW(it), "diskselector", "item", elm_widget_style_get(obj)); - edje_object_part_text_set(it->base.view, "elm.text", it->label); + edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label); } } _elm_theme_object_set(obj, wd->right_blank, "diskselector", "item", @@ -346,11 +563,11 @@ static void _select_item(Elm_Diskselector_Item *it) { if (!it) return; - Widget_Data *wd = elm_widget_data_get(it->base.widget); + Widget_Data *wd = elm_widget_data_get(WIDGET(it)); wd->selected_item = it; _selected_item_indicate(wd->selected_item); - if (it->func) it->func((void *)it->base.data, it->base.widget, it); - evas_object_smart_callback_call(it->base.widget, SIG_SELECTED, it); + if (it->func) it->func((void *)it->base.data, WIDGET(it), it); + evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, it); } static void @@ -390,23 +607,29 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty return EINA_TRUE; } - if ((!strcmp(ev->keyname, "Left")) || (!strcmp(ev->keyname, "KP_Left")) || - (!strcmp(ev->keyname, "Up")) || (!strcmp(ev->keyname, "KP_Up"))) + if ((!strcmp(ev->keyname, "Left")) || + ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)) || + (!strcmp(ev->keyname, "Up")) || + ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string))) { l = wd->selected_item->node->prev; if ((!l) && (wd->round)) l = eina_list_last(wd->items); } - else if ((!strcmp(ev->keyname, "Right")) || (!strcmp(ev->keyname, "KP_Right")) || - (!strcmp(ev->keyname, "Down")) || (!strcmp(ev->keyname, "KP_Down"))) + else if ((!strcmp(ev->keyname, "Right")) || + ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)) || + (!strcmp(ev->keyname, "Down")) || + ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string))) { l = wd->selected_item->node->next; if ((!l) && (wd->round)) l = wd->items; } - else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home"))) + else if ((!strcmp(ev->keyname, "Home")) || + ((!strcmp(ev->keyname, "KP_Home")) && (!ev->string))) l = wd->items; - else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End"))) + else if ((!strcmp(ev->keyname, "End")) || + ((!strcmp(ev->keyname, "KP_End")) && (!ev->string))) l = eina_list_last(wd->items); else return EINA_FALSE; @@ -417,133 +640,30 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty { wd->selected_item = it; if (!wd->idler) - wd->idler = ecore_idler_add(_move_scroller, obj); + wd->idler = ecore_idle_enterer_before_add(_move_scroller, obj); } ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; return EINA_TRUE; } -static int -_count_letter(const char *str) -{ - int pos = 0; - int code = 0, chnum; - - for (chnum = 0; ; chnum++) - { - pos = evas_string_char_next_get(str, pos, &code); - if (code == 0) break; - } - return chnum; -} - -static int -_check_letter(const char *str, int length) -{ - int pos = 0; - int code = 0, chnum; - - for (chnum = 0; ; chnum++) - { - if (chnum == length) break; - pos = evas_string_char_next_get(str, pos, &code); - if (code == 0) break; - } - return pos; -} - -static Eina_Bool -_check_string(void *data) -{ - int mid, steps, length, diff; - Elm_Diskselector_Item *it; - Eina_List *list, *l; - Evas_Coord ox, ow; - char buf[1024]; - Widget_Data *wd = data; - - evas_object_geometry_get(wd->scroller, &ox, NULL, &ow, NULL); - if (ow <= 0) - return EINA_FALSE; - if (!wd->init) - return EINA_FALSE; - if (!wd->round) - list = wd->items; - else - list = wd->r_items; - - EINA_LIST_FOREACH(list, l, it) - { - Evas_Coord x, w; - int len; - evas_object_geometry_get(it->base.view, &x, NULL, &w, NULL); - /* item not visible */ - if ((x + w <= ox) || (x >= ox + ow)) - continue; - - len = _count_letter(it->label); -// // FIXME: len should be # of ut8f letters. ie count using utf8 string walk, not stringshare len -// len = eina_stringshare_strlen(it->label); - - if (x <= ox + 5) - edje_object_signal_emit(it->base.view, "elm,state,left_side", - "elm"); - else if (x + w >= ox + ow - 5) - edje_object_signal_emit(it->base.view, "elm,state,right_side", - "elm"); - else - { - if ((wd->len_threshold) && (len > wd->len_threshold)) - edje_object_signal_emit(it->base.view, "elm,state,center_small", - "elm"); - else - edje_object_signal_emit(it->base.view, "elm,state,center", - "elm"); - } - - // if len is les that the limit len, skip anyway - if (len <= wd->len_side) - continue; - - steps = len - wd->len_side + 1; - mid = x + w / 2; - if (mid <= ox + ow / 2) - diff = (ox + ow / 2) - mid; - else - diff = mid - (ox + ow / 2); - - length = len - (int)(diff * steps / (ow / 3)); - length = MAX(length, wd->len_side); - // limit string len to "length" ut8f chars - length = _check_letter(it->label, length); - // cut it off at byte mark returned form _check_letter - strncpy(buf, it->label, length); - buf[length] = '\0'; - edje_object_part_text_set(it->base.view, "elm.text", buf); - } - - if (wd->check_idler) - ecore_idler_del(wd->check_idler); - wd->check_idler = NULL; - return EINA_FALSE; -} - static void _selected_item_indicate(Elm_Diskselector_Item *it) { Elm_Diskselector_Item *item; Eina_List *l; Widget_Data *wd; - wd = elm_widget_data_get(it->base.widget); + wd = elm_widget_data_get(WIDGET(it)); if (!wd) return; + if (!it->label) return; EINA_LIST_FOREACH(wd->r_items, l, item) { - if (!strcmp(item->label, it->label)) edje_object_signal_emit(item->base.view, "elm,state,selected", "elm"); + if (item->label && !strcmp(item->label, it->label)) + edje_object_signal_emit(VIEW(item), "elm,state,selected", "elm"); else - edje_object_signal_emit(item->base.view, "elm,state,default", "elm"); + edje_object_signal_emit(VIEW(item), "elm,state,default", "elm"); } } @@ -556,7 +676,7 @@ _item_click_cb(void *data, Evas_Object *obj __UNUSED__, if (!it) return; Widget_Data *wd; - wd = elm_widget_data_get(it->base.widget); + wd = elm_widget_data_get(WIDGET(it)); if (!wd) return; @@ -566,7 +686,7 @@ _item_click_cb(void *data, Evas_Object *obj __UNUSED__, _selected_item_indicate(wd->selected_item); } - if (it->func) it->func((void *)it->base.data, it->base.widget, it); + if (it->func) it->func((void *)it->base.data, WIDGET(it), it); } static void @@ -596,12 +716,11 @@ static void _scroller_stop_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Elm_Diskselector_Item *it; - Widget_Data *wd = data; + Widget_Data *wd = elm_widget_data_get(data); Evas_Coord x, w, ow; Eina_List *l, *list; - if (wd->idler) - return; + if (wd->idler) return; if (!wd->round) list = wd->items; @@ -611,15 +730,34 @@ _scroller_stop_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN evas_object_geometry_get(wd->scroller, NULL, NULL, &ow, NULL); EINA_LIST_FOREACH(list, l, it) { - evas_object_geometry_get(it->base.view, &x, NULL, &w, NULL); - if (abs((int)(ow / 2 - (int)(x + w / 2))) < 10) - break; + evas_object_geometry_get(VIEW(it), &x, NULL, &w, NULL); + if (abs((int)(ow / 2 - (int)(x + w / 2))) < 10) break; } - if (!it) - return; - + if (!it) return; _select_item(it); + evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_STOP, it); +} + +static void +_scroller_start_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +{ + evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_START, + elm_diskselector_selected_item_get(data)); +} + +static void +_drag_start_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +{ + evas_object_smart_callback_call(data, SIG_SCROLL_DRAG_START, + elm_diskselector_selected_item_get(data)); +} + +static void +_drag_stop_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +{ + evas_object_smart_callback_call(data, SIG_SCROLL_DRAG_STOP, + elm_diskselector_selected_item_get(data)); } static Eina_Bool @@ -627,7 +765,7 @@ _move_scroller(void *data) { Evas_Object *obj = data; Widget_Data *wd; - Eina_List *l; + Eina_List *list, *l; Elm_Diskselector_Item *dit; Evas_Coord y, w, h; int i; @@ -635,17 +773,26 @@ _move_scroller(void *data) wd = elm_widget_data_get(obj); if (!wd) return EINA_FALSE; - if (wd->round) - i = 1; + if (!wd->round) + { + i = 0; + list = wd->items; + } else - i = 0; + { + i = 1; + list = wd->r_items; + } - EINA_LIST_FOREACH(wd->items, l, dit) + EINA_LIST_FOREACH(list, l, dit) { if (wd->selected_item == dit) - break; + break; i++; } + + if (wd->round) i -= CEIL(wd->display_item_num); + if (!dit) { wd->selected_item = @@ -654,11 +801,15 @@ _move_scroller(void *data) } evas_object_geometry_get(wd->scroller, NULL, &y, &w, &h); - elm_smart_scroller_child_region_show(wd->scroller, w / wd->display_item_num * i, y, w, h); + //move scroller in two steps for getting smooth launching effect. + if (i > 2) + elm_smart_scroller_child_region_show(wd->scroller, w / wd->display_item_num * (i-2), y, w, h); + elm_smart_scroller_region_bring_in(wd->scroller, w / wd->display_item_num * i, y, w, h); + _select_item(dit); if (wd->idler) { - ecore_idler_del(wd->idler); + ecore_idle_enterer_del(wd->idler); wd->idler = NULL; } wd->init = EINA_TRUE; @@ -671,11 +822,10 @@ static void _round_item_del(Widget_Data *wd, Elm_Diskselector_Item *it) { if (!it) return; - elm_box_unpack(wd->main_box, it->base.view); + elm_box_unpack(wd->main_box, VIEW(it)); wd->r_items = eina_list_remove(wd->r_items, it); eina_stringshare_del(it->label); - evas_object_del(it->base.view); - free(it); + elm_widget_item_free(it); } static void @@ -696,14 +846,14 @@ _round_items_del(Widget_Data *wd) EINA_LIST_FOREACH(wd->under_items, l, it) { _round_item_del(wd, it); - it = NULL; } + wd->under_items = eina_list_free(wd->under_items); EINA_LIST_FOREACH(wd->over_items, l, it) { _round_item_del(wd, it); - it = NULL; } + wd->over_items = eina_list_free(wd->over_items); } static void @@ -718,7 +868,7 @@ _round_items_add(Widget_Data *wd) if (!wd->first) { - wd->first = _item_new(it->base.widget, it->icon, it->label, it->func, + wd->first = _item_new(WIDGET(it), it->icon, it->label, it->func, it->base.data); wd->first->node = it->node; wd->r_items = eina_list_append(wd->r_items, wd->first); @@ -729,7 +879,7 @@ _round_items_add(Widget_Data *wd) it = dit; if (!wd->second) { - wd->second = _item_new(it->base.widget, it->icon, it->label, it->func, + wd->second = _item_new(WIDGET(it), it->icon, it->label, it->func, it->base.data); wd->second->node = it->node; wd->r_items = eina_list_append(wd->r_items, wd->second); @@ -740,7 +890,7 @@ _round_items_add(Widget_Data *wd) { it = eina_list_nth(wd->items, i); if (!it) it = dit; - temp_it = _item_new(it->base.widget, it->icon, it->label, it->func, it->base.data); + temp_it = _item_new(WIDGET(it), it->icon, it->label, it->func, it->base.data); wd->over_items = eina_list_append(wd->over_items, temp_it); wd->r_items = eina_list_append(wd->r_items, temp_it); } @@ -750,7 +900,7 @@ _round_items_add(Widget_Data *wd) it = dit; if (!wd->last) { - wd->last = _item_new(it->base.widget, it->icon, it->label, it->func, + wd->last = _item_new(WIDGET(it), it->icon, it->label, it->func, it->base.data); wd->last->node = it->node; wd->r_items = eina_list_prepend(wd->r_items, wd->last); @@ -761,7 +911,7 @@ _round_items_add(Widget_Data *wd) it = dit; if (!wd->s_last) { - wd->s_last = _item_new(it->base.widget, it->icon, it->label, it->func, + wd->s_last = _item_new(WIDGET(it), it->icon, it->label, it->func, it->base.data); wd->s_last->node = it->node; wd->r_items = eina_list_prepend(wd->r_items, wd->s_last); @@ -772,20 +922,112 @@ _round_items_add(Widget_Data *wd) { it = eina_list_nth(wd->items, wd->item_count - i); if (!it) it = dit; - temp_it = _item_new(it->base.widget, it->icon, it->label, it->func, it->base.data); + temp_it = _item_new(WIDGET(it), it->icon, it->label, it->func, it->base.data); wd->under_items = eina_list_append(wd->under_items, temp_it); wd->r_items = eina_list_prepend(wd->r_items, temp_it); } } -/** - * Add a new diskselector object - * - * @param parent The parent object - * @return The new object or NULL if it cannot be created - * - * @ingroup Diskselector - */ +static void +_item_icon_set(Elm_Diskselector_Item *it, Evas_Object *icon) +{ + if (it->icon == icon) return; + if (it->icon) evas_object_del(it->icon); + it->icon = icon; + if (VIEW(it)) + { + evas_object_size_hint_min_set(it->icon, 24, 24); + evas_object_size_hint_max_set(it->icon, 40, 40); + edje_object_part_swallow(VIEW(it), "elm.swallow.icon", it->icon); + evas_object_show(it->icon); + elm_widget_sub_object_add(WIDGET(it), it->icon); + } +} + +static void +_check_identical_item(Elm_Diskselector_Item *it, Evas_Object *icon) +{ + Widget_Data *wd; + Elm_Diskselector_Item *dit; + Eina_List *l; + int idx = 0; + int ic = 0; + int ac = 0; + + wd = elm_widget_data_get(WIDGET(it)); + if (!wd) return; + + if (wd->round) + { + // Get index from indentical item from round items + EINA_LIST_FOREACH(wd->r_items, l, dit) + { + if (it == dit) break; + idx++; + } + + // No item to match + ic = eina_list_count(wd->r_items); + if (idx >= ic) return; + dit = NULL; + + // Number of added items: CEIL(wd->display_item_num) + ac = CEIL(wd->display_item_num); + + if (((idx >= 0) && (idx < ac)) || + ((idx >= ac) && (idx < (2 * ac)))) + { + // Selected item: under, low region + dit = eina_list_nth(wd->r_items, + idx + ic - (2 * ac)); + } + else if (((idx >= (ic - ac)) && (idx < ic)) || + ((idx >= (ic - (2 * ac))) && (idx < ic - ac))) + { + // Selected item: over, high region + dit = eina_list_nth(wd->r_items, + idx - ic + (2 * ac)); + } + + if (dit) _item_icon_set(dit, icon); + _sizing_eval(wd->self); + } +} + +static void +_item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label) +{ + Elm_Diskselector_Item *item; + if (part && strcmp(part, "default")) return; + item = (Elm_Diskselector_Item *)it; + eina_stringshare_replace(&item->label, label); + edje_object_part_text_escaped_set(VIEW(item), "elm.text", item->label); +} + +static const char * +_item_text_get_hook(const Elm_Object_Item *it, const char *part) +{ + if (part && strcmp(part, "default")) return NULL; + return ((Elm_Diskselector_Item *)it)->label; +} + +static void +_item_content_set_hook(Elm_Object_Item *it, + const char *part, + Evas_Object *content) +{ + if (part && strcmp(part, "icon")) return; + _item_icon_set((Elm_Diskselector_Item *)it, content); + _check_identical_item((Elm_Diskselector_Item *)it, content); +} + +static Evas_Object * +_item_content_get_hook(const Elm_Object_Item *it, const char *part) +{ + if (part && strcmp(part, "icon")) return NULL; + return ((Elm_Diskselector_Item *)it)->icon; +} + EAPI Evas_Object * elm_diskselector_add(Evas_Object *parent) { @@ -823,7 +1065,14 @@ elm_diskselector_add(Evas_Object *parent) evas_object_smart_callback_add(wd->scroller, "scroll", _scroller_move_cb, wd); evas_object_smart_callback_add(wd->scroller, "animate,stop", - _scroller_stop_cb, wd); + _scroller_stop_cb, obj); + evas_object_smart_callback_add(wd->scroller, "animate,start", + _scroller_start_cb, obj); + evas_object_smart_callback_add(wd->scroller, "drag,stop", + _drag_stop_cb, obj); + evas_object_smart_callback_add(wd->scroller, "drag,start", + _drag_start_cb, obj); + _elm_theme_object_set(obj, wd->scroller, "diskselector", "base", "default"); evas_object_event_callback_add(wd->scroller, EVAS_CALLBACK_RESIZE, @@ -870,19 +1119,8 @@ elm_diskselector_add(Evas_Object *parent) return obj; } -/** - * Get round mode - * - * If round mode is activated the items list will work like a circle list, - * so when the user reaches the last item, the first one will popup. - * - * @param obj The diskselector object - * @return if or not set round mode or false if not a valid diskselector - * - * @ingroup Diskselector - */ EAPI Eina_Bool -elm_diskselector_round_get(const Evas_Object *obj) +elm_diskselector_round_enabled_get(const Evas_Object *obj) { ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; Widget_Data *wd = elm_widget_data_get(obj); @@ -890,19 +1128,8 @@ elm_diskselector_round_get(const Evas_Object *obj) return wd->round; } -/** - * Set round mode - * - * If round mode is activated the items list will work like a circle list, - * so when the user reaches the last item, the first one will popup. - * - * @param it The item of diskselector - * @param if or not set round mode - * - * @ingroup Diskselector - */ EAPI void -elm_diskselector_round_set(Evas_Object * obj, Eina_Bool round) +elm_diskselector_round_enabled_set(Evas_Object * obj, Eina_Bool enabled) { Eina_List *elist; Elm_Diskselector_Item *it; @@ -911,11 +1138,11 @@ elm_diskselector_round_set(Evas_Object * obj, Eina_Bool round) Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - if (wd->round == round) + if (wd->round == enabled) return; - wd->round = round; - if (round) + wd->round = !!enabled; + if (enabled) { wd->r_items = eina_list_clone(wd->items); elm_box_unpack(wd->main_box, wd->left_blank); @@ -928,22 +1155,22 @@ elm_diskselector_round_set(Evas_Object * obj, Eina_Bool round) _round_items_add(wd); if (wd->last) - elm_box_pack_start(wd->main_box, wd->last->base.view); + elm_box_pack_start(wd->main_box, wd->VIEW(last)); if (wd->s_last) - elm_box_pack_start(wd->main_box, wd->s_last->base.view); + elm_box_pack_start(wd->main_box, wd->VIEW(s_last)); // if more than 3 items should be displayed EINA_LIST_FOREACH(wd->under_items, elist, it) - elm_box_pack_start(wd->main_box, it->base.view); + elm_box_pack_start(wd->main_box, VIEW(it)); if (wd->first) - elm_box_pack_end(wd->main_box, wd->first->base.view); + elm_box_pack_end(wd->main_box, wd->VIEW(first)); if (wd->second) - elm_box_pack_end(wd->main_box, wd->second->base.view); + elm_box_pack_end(wd->main_box, wd->VIEW(second)); // if more than 3 items should be displayed EINA_LIST_FOREACH(wd->over_items, elist, it) - elm_box_pack_end(wd->main_box, it->base.view); + elm_box_pack_end(wd->main_box, VIEW(it)); } else { @@ -954,20 +1181,12 @@ elm_diskselector_round_set(Evas_Object * obj, Eina_Bool round) wd->r_items = NULL; } + _selected_item_indicate(wd->selected_item); _sizing_eval(obj); } -/** - * Get the side labels max length - * - * @param obj The diskselector object - * @return The max length defined for side labels, or 0 if not a valid - * diskselector - * - * @ingroup Diskselector - */ EAPI int -elm_diskselector_side_label_length_get(const Evas_Object *obj) +elm_diskselector_side_text_max_length_get(const Evas_Object *obj) { ELM_CHECK_WIDTYPE(obj, widtype) 0; Widget_Data *wd = elm_widget_data_get(obj); @@ -975,16 +1194,8 @@ elm_diskselector_side_label_length_get(const Evas_Object *obj) return wd->len_side; } -/** - * Set the side labels max length - * - * @param obj The diskselector object - * @param len The max length defined for side labels - * - * @ingroup Diskselector - */ EAPI void -elm_diskselector_side_label_length_set(Evas_Object *obj, int len) +elm_diskselector_side_text_max_length_set(Evas_Object *obj, int len) { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); @@ -993,31 +1204,6 @@ elm_diskselector_side_label_length_set(Evas_Object *obj, int len) } EAPI void -elm_diskselector_side_label_lenght_set(Evas_Object *obj, int len) -{ - return elm_diskselector_side_label_length_set(obj, len); -} - -EAPI int -elm_diskselector_side_label_lenght_get(const Evas_Object *obj) -{ - return elm_diskselector_side_label_length_get(obj); -} - -/** - * Set bounce mode - * - * This will enable or disable the scroller bounce mode for the diskselector. - * See elm_scroller_bounce_set() for details. Horizontal bounce is enabled by - * default. - * - * @param obj The diskselector object - * @param h_bounce Allow bounce horizontally - * @param v_bounce Allow bounce vertically - * - * @ingroup Diskselector - */ -EAPI void elm_diskselector_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce) { ELM_CHECK_WIDTYPE(obj, widtype); @@ -1027,15 +1213,6 @@ elm_diskselector_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bo elm_smart_scroller_bounce_allow_set(wd->scroller, h_bounce, v_bounce); } -/** - * Get the bounce mode - * - * @param obj The Diskselector object - * @param h_bounce Allow bounce horizontally - * @param v_bounce Allow bounce vertically - * - * @ingroup Diskselector - */ EAPI void elm_diskselector_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce) { @@ -1045,23 +1222,6 @@ elm_diskselector_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bo elm_smart_scroller_bounce_allow_get(wd->scroller, h_bounce, v_bounce); } -/** - * Get the scrollbar policy - * - * This sets the scrollbar visibility policy for the given scroller. - * ELM_SMART_SCROLLER_POLICY_AUTO means the scrollber is made visible if it - * is needed, and otherwise kept hidden. ELM_SMART_SCROLLER_POLICY_ON turns - * it on all the time, and ELM_SMART_SCROLLER_POLICY_OFF always keeps it off. - * This applies respectively for the horizontal and vertical scrollbars. - * The both are disabled by default. - * - * @param obj The diskselector object - * @param policy_h Horizontal scrollbar policy - * @param policy_v Vertical scrollbar policy - * - * @ingroup Diskselector - */ - EAPI void elm_diskselector_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v) { @@ -1074,41 +1234,18 @@ elm_diskselector_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_v = (Elm_Scroller_Policy) s_policy_v; } - -/** - * Set the scrollbar policy - * - * This sets the scrollbar visibility policy for the given scroller. - * ELM_SMART_SCROLLER_POLICY_AUTO means the scrollber is made visible if it - * is needed, and otherwise kept hidden. ELM_SMART_SCROLLER_POLICY_ON turns - * it on all the time, and ELM_SMART_SCROLLER_POLICY_OFF always keeps it off. - * This applies respectively for the horizontal and vertical scrollbars. - * The both are disabled by default. - * - * @param obj The diskselector object - * @param policy_h Horizontal scrollbar policy - * @param policy_v Vertical scrollbar policy - * - * @ingroup Diskselector - */ EAPI void elm_diskselector_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) return; - if ((policy_h >= 3) || (policy_v >= 3)) return; - if (wd->scroller) - elm_smart_scroller_policy_set(wd->scroller, policy_h, policy_v); + if ((!wd) || (!wd->scroller)) return; + if ((policy_h >= ELM_SCROLLER_POLICY_LAST) || + (policy_v >= ELM_SCROLLER_POLICY_LAST)) + return; + elm_smart_scroller_policy_set(wd->scroller, policy_h, policy_v); } -/** - * Clears a diskselector of all items. - * - * @param obj The diskselector object - * - * @ingroup Diskselector - */ EAPI void elm_diskselector_clear(Evas_Object *obj) { @@ -1120,19 +1257,15 @@ elm_diskselector_clear(Evas_Object *obj) if (!wd->items) return; wd->selected_item = NULL; - EINA_LIST_FREE(wd->items, it) _item_del(it); + EINA_LIST_FREE(wd->items, it) + { + _item_del(it); + elm_widget_item_free(it); + } _round_items_del(wd); _sizing_eval(obj); } -/** - * Returns a list of all the diskselector items. - * - * @param obj The diskselector object - * @return An Eina_List* of the diskselector items, or NULL on failure - * - * @ingroup Diskselector - */ EAPI const Eina_List * elm_diskselector_items_get(const Evas_Object *obj) { @@ -1142,20 +1275,7 @@ elm_diskselector_items_get(const Evas_Object *obj) return wd->items; } -/** - * Appends an item to the diskselector object. - * - * @param obj The diskselector object - * @param label The label of the diskselector item - * @param icon The icon object to use for the left side of the item - * @param func The function to call when the item is selected - * @param data The data to associate with the item for related callbacks - * - * @return The created item or NULL upon failure - * - * @ingroup Diskselector - */ -EAPI Elm_Diskselector_Item * +EAPI Elm_Object_Item * elm_diskselector_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data) { Elm_Diskselector_Item *it; @@ -1173,607 +1293,107 @@ elm_diskselector_item_append(Evas_Object *obj, const char *label, Evas_Object *i wd->r_items = eina_list_append(wd->r_items, it); _round_items_add(wd); if (wd->last) - elm_box_pack_start(wd->main_box, wd->last->base.view); + elm_box_pack_start(wd->main_box, wd->VIEW(last)); if (wd->s_last) - elm_box_pack_start(wd->main_box, wd->s_last->base.view); - elm_box_pack_end(wd->main_box, it->base.view); + elm_box_pack_start(wd->main_box, wd->VIEW(s_last)); + elm_box_pack_end(wd->main_box, VIEW(it)); if (wd->first) - elm_box_pack_end(wd->main_box, wd->first->base.view); + elm_box_pack_end(wd->main_box, wd->VIEW(first)); if (wd->second) - elm_box_pack_end(wd->main_box, wd->second->base.view); + elm_box_pack_end(wd->main_box, wd->VIEW(second)); } else { elm_box_unpack(wd->main_box, wd->right_blank); - elm_box_pack_end(wd->main_box, it->base.view); + elm_box_pack_end(wd->main_box, VIEW(it)); elm_box_pack_end(wd->main_box, wd->right_blank); } if (!wd->selected_item) wd->selected_item = it; if (!wd->idler) - wd->idler = ecore_idler_add(_move_scroller, obj); + wd->idler = ecore_idle_enterer_before_add(_move_scroller, obj); _sizing_eval(obj); - return it; -} - -/** - * Delete the item - * - * @param it The item of diskselector - * - * @ingroup Diskselector - */ -EAPI void -elm_diskselector_item_del(Elm_Diskselector_Item * it) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it); - Elm_Diskselector_Item *dit; - Elm_Diskselector_Item *item; - Eina_List *l; - int i = 0; - Widget_Data *wd = elm_widget_data_get(it->base.widget); - if (!wd) return; - - elm_box_unpack(wd->main_box, it->base.view); - - if (wd->round) - wd->r_items = eina_list_remove(wd->r_items, it); - - wd->items = eina_list_remove(wd->items, it); - - if (wd->selected_item == it) - { - dit = (Elm_Diskselector_Item *) eina_list_nth(wd->items, 0); - if (dit != it) - wd->selected_item = dit; - else - wd->selected_item = eina_list_nth(wd->items, 1); - - _selected_item_indicate(wd->selected_item); - } - - _item_del(it); - wd->item_count -= 1; - - if (wd->round) - { - if (!wd->item_count) - { - evas_object_hide(wd->first->base.view); - evas_object_hide(wd->second->base.view); - evas_object_hide(wd->last->base.view); - evas_object_hide(wd->s_last->base.view); - - EINA_LIST_FOREACH(wd->under_items, l, item) - evas_object_hide(item->base.view); - - EINA_LIST_FOREACH(wd->over_items, l, item) - evas_object_hide(item->base.view); - } - else - { - dit = eina_list_nth(wd->items, 0); - if (dit) - { - eina_stringshare_replace(&wd->first->label, dit->label); - edje_object_part_text_set(wd->first->base.view, "elm.text", - wd->first->label); - } - dit = eina_list_nth(wd->items, 1); - if (dit) - { - eina_stringshare_replace(&wd->second->label, dit->label); - edje_object_part_text_set(wd->second->base.view, "elm.text", - wd->second->label); - } - // if more than 3 itmes should be displayed - for (i = 2; i < CEIL(wd->display_item_num); i++) - { - dit = eina_list_nth(wd->items, i); - item = eina_list_nth(wd->over_items, i - 2); - eina_stringshare_replace(&item->label, dit->label); - edje_object_part_text_set(item->base.view, "elm.text", item->label); - } - - dit = eina_list_nth(wd->items, eina_list_count(wd->items) - 1); - if (dit) - { - eina_stringshare_replace(&wd->last->label, dit->label); - edje_object_part_text_set(wd->last->base.view, "elm.text", - wd->last->label); - } - dit = eina_list_nth(wd->items, eina_list_count(wd->items) - 2); - if (dit) - { - eina_stringshare_replace(&wd->s_last->label, dit->label); - edje_object_part_text_set(wd->s_last->base.view, "elm.text", - wd->s_last->label); - } - // if more than 3 itmes should be displayed - for (i = 3; i <= CEIL(wd->display_item_num); i++) - { - dit = eina_list_nth(wd->items, wd->item_count - i); - item = eina_list_nth(wd->under_items, i - 3); - eina_stringshare_replace(&item->label, dit->label); - edje_object_part_text_set(item->base.view, "elm.text", item->label); - } - } - } - wd->check_idler = ecore_idler_add(_check_string, wd); - _sizing_eval(wd->self); -} - -/** - * Get the label of item - * - * @param it The item of diskselector - * @return The label of item - * - * @ingroup Diskselector - */ -EAPI const char * -elm_diskselector_item_label_get(const Elm_Diskselector_Item * it) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, NULL); - return it->label; -} - -/** - * Set the label of item - * - * @param it The item of diskselector - * @param label The label of item - * - * @ingroup Diskselector - */ -EAPI void -elm_diskselector_item_label_set(Elm_Diskselector_Item * it, const char *label) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it); - eina_stringshare_replace(&it->label, label); - edje_object_part_text_set(it->base.view, "elm.text", it->label); + return (Elm_Object_Item *)it; } -/** - * Get the selected item - * - * @param obj The diskselector object - * @return The selected diskselector item - * - * @ingroup Diskselector - */ -EAPI Elm_Diskselector_Item * +EAPI Elm_Object_Item * elm_diskselector_selected_item_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->selected_item; + return (Elm_Object_Item *) wd->selected_item; } -/** - * Set the selected state of an item - * - * This sets the selected state (EINA_TRUE selected, EINA_FALSE not selected) - * of the given item @p it. - * If a new item is selected the previosly selected will be unselected. - * If the item @p it is unselected, the first item will be selected. - * - * @param it The diskselector item - * @param selected The selected state - * - * @ingroup Diskselector - */ EAPI void -elm_diskselector_item_selected_set(Elm_Diskselector_Item *it, Eina_Bool selected) +elm_diskselector_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) { - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it); + ELM_OBJ_ITEM_CHECK_OR_RETURN(it); Widget_Data *wd; - wd = elm_widget_data_get(it->base.widget); + Elm_Diskselector_Item *item = (Elm_Diskselector_Item *)it; + wd = elm_widget_data_get(WIDGET(item)); if (!wd) return; - if ((wd->selected_item == it) && (selected)) + if ((wd->selected_item == item) && (selected)) return; - if ((wd->selected_item == it) && (!selected)) + if ((wd->selected_item == item) && (!selected)) wd->selected_item = eina_list_data_get(wd->items); else { - wd->selected_item = it; + wd->selected_item = item; _selected_item_indicate(wd->selected_item); } if (!wd->idler) - ecore_idler_add(_move_scroller, it->base.widget); + wd->idler = ecore_idle_enterer_before_add(_move_scroller, WIDGET(item)); } -/* - * Get the selected state of @p item. - * - * @param it The diskselector item - * @return If true, the item is selected - * - * @ingroup Diskselector - */ EAPI Eina_Bool -elm_diskselector_item_selected_get(const Elm_Diskselector_Item *it) +elm_diskselector_item_selected_get(const Elm_Object_Item *it) { - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); - Widget_Data *wd; - - wd = elm_widget_data_get(it->base.widget); + ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); + Widget_Data *wd = elm_widget_data_get(WIDGET(it)); if (!wd) return EINA_FALSE; - return (wd->selected_item == it); -} - -/** - * Set the function called when a diskselector item is freed. - * - * @param it The item to set the callback on - * @param func The function called - * - * @ingroup Diskselector - */ -EAPI void -elm_diskselector_item_del_cb_set(Elm_Diskselector_Item *it, Evas_Smart_Cb func) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it); - elm_widget_item_del_cb_set(it, func); -} - -/** - * Returns the data associated with the item. - * - * @param it The diskselector item - * @return The data associated with @p it - * - * @ingroup Diskselector - */ -EAPI void * -elm_diskselector_item_data_get(const Elm_Diskselector_Item *it) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, NULL); - return elm_widget_item_data_get(it); -} - -/** - * Returns the icon associated with the item. - * - * @param it The diskselector item - * @return The icon associated with @p it - * - * @ingroup Diskselector - */ -EAPI Evas_Object * -elm_diskselector_item_icon_get(const Elm_Diskselector_Item *it) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, NULL); - return it->icon; -} - -/** - * Sets the icon associated with the item. - * - * Once the icon object is set, a previously set one will be deleted. - * You probably don't want, then, to have the same icon object set - * for more than one item of the diskselector. - * - * @param it The diskselector item - * @param icon The icon object to associate with @p it - * - * @ingroup Diskselector - */ -EAPI void -elm_diskselector_item_icon_set(Elm_Diskselector_Item *it, Evas_Object *icon) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it); - if (it->icon == icon) return; - if (it->icon) - evas_object_del(it->icon); - it->icon = icon; - if (it->base.view) - edje_object_part_swallow(it->base.view, "elm.swallow.icon", icon); + return (wd->selected_item == ((Elm_Diskselector_Item *)it)); } -/** - * Gets the item before @p it in the list. - * - * @param it The diskselector item - * @return The item before @p it, or NULL on failure - * - * @ingroup Diskselector - */ -EAPI Elm_Diskselector_Item * -elm_diskselector_item_prev_get(const Elm_Diskselector_Item *it) +EAPI Elm_Object_Item * +elm_diskselector_item_prev_get(const Elm_Object_Item *it) { - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, NULL); - if (it->node->prev) return it->node->prev->data; + ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); + Elm_Diskselector_Item *item = (Elm_Diskselector_Item *)it; + if (item->node->prev) return item->node->prev->data; else return NULL; } -/** - * Gets the item after @p it in the list. - * - * @param it The diskselector item - * @return The item after @p it, or NULL on failure - * - * @ingroup Diskselector - */ -EAPI Elm_Diskselector_Item * -elm_diskselector_item_next_get(const Elm_Diskselector_Item *it) +EAPI Elm_Object_Item * +elm_diskselector_item_next_get(const Elm_Object_Item *it) { - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(it, NULL); - if (it->node->next) return it->node->next->data; + ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); + Elm_Diskselector_Item *item = (Elm_Diskselector_Item *)it; + if (item->node->next) return item->node->next->data; else return NULL; } -/** - * Get the first item in the diskselector - * - * @param obj The diskselector object - * @return The first item, or NULL if none - * - * @ingroup Diskselector - */ -EAPI Elm_Diskselector_Item * +EAPI Elm_Object_Item * elm_diskselector_first_item_get(const Evas_Object *obj) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd; - - wd = elm_widget_data_get(obj); - if (!wd || !wd->items) - return NULL; - + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd || !wd->items) return NULL; return eina_list_data_get(wd->items); } -/** - * Get the last item in the diskselector - * - * @param obj The diskselector object - * @return The last item, or NULL if none - * - * @ingroup Diskselector - */ -EAPI Elm_Diskselector_Item * +EAPI Elm_Object_Item * elm_diskselector_last_item_get(const Evas_Object *obj) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; - - Widget_Data *wd; - wd = elm_widget_data_get(obj); - if (!wd || !wd->items) - return NULL; - + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd || !wd->items) return NULL; return eina_list_data_get(eina_list_last(wd->items)); } -/** - * Set the text to be shown in the diskselector item. - * - * @param item Target item - * @param text The text to set in the content - * - * Setup the text as tooltip to object. The item can have only one tooltip, - * so any previous tooltip data is removed. - * - * @ingroup Diskselector - */ -EAPI void -elm_diskselector_item_tooltip_text_set(Elm_Diskselector_Item *item, const char *text) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item); - elm_widget_item_tooltip_text_set(item, text); -} - -/** - * Set the content to be shown in the tooltip item - * - * Setup the tooltip to item. The item can have only one tooltip, - * so any previous tooltip data is removed. @p func(with @p data) will - * be called every time that need show the tooltip and it should - * return a valid Evas_Object. This object is then managed fully by - * tooltip system and is deleted when the tooltip is gone. - * - * @param item the diskselector item being attached a tooltip. - * @param func the function used to create the tooltip contents. - * @param data what to provide to @a func as callback data/context. - * @param del_cb called when data is not needed anymore, either when - * another callback replaces @func, the tooltip is unset with - * elm_diskselector_item_tooltip_unset() or the owner @a item - * dies. This callback receives as the first parameter the - * given @a data, and @c event_info is the item. - * - * @ingroup Diskselector - */ -EAPI void -elm_diskselector_item_tooltip_content_cb_set(Elm_Diskselector_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item); - elm_widget_item_tooltip_content_cb_set(item, func, data, del_cb); -} - -/** - * Unset tooltip from item - * - * @param item diskselector item to remove previously set tooltip. - * - * Remove tooltip from item. The callback provided as del_cb to - * elm_diskselector_item_tooltip_content_cb_set() will be called to notify - * it is not used anymore. - * - * @see elm_diskselector_item_tooltip_content_cb_set() - * - * @ingroup Diskselector - */ -EAPI void -elm_diskselector_item_tooltip_unset(Elm_Diskselector_Item *item) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item); - elm_widget_item_tooltip_unset(item); -} - -/** - * Sets a different style for this item tooltip. - * - * @note before you set a style you should define a tooltip with - * elm_diskselector_item_tooltip_content_cb_set() or - * elm_diskselector_item_tooltip_text_set() - * - * @param item diskselector item with tooltip already set. - * @param style the theme style to use (default, transparent, ...) - * - * @ingroup Diskselector - */ -EAPI void -elm_diskselector_item_tooltip_style_set(Elm_Diskselector_Item *item, const char *style) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item); - elm_widget_item_tooltip_style_set(item, style); -} - -/** - * Get the style for this item tooltip. - * - * @param item diskselector item with tooltip already set. - * @return style the theme style in use, defaults to "default". If the - * object does not have a tooltip set, then NULL is returned. - * - * @ingroup Diskselector - */ -EAPI const char * -elm_diskselector_item_tooltip_style_get(const Elm_Diskselector_Item *item) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item, NULL); - return elm_widget_item_tooltip_style_get(item); -} - -/** - * Set the cursor to be shown when mouse is over the diskselector item - * - * @param item Target item - * @param cursor the cursor name to be used. - * - * @see elm_object_cursor_set() - * @ingroup Diskselector - */ -EAPI void -elm_diskselector_item_cursor_set(Elm_Diskselector_Item *item, const char *cursor) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item); - elm_widget_item_cursor_set(item, cursor); -} - -/** - * Get the cursor to be shown when mouse is over the diskselector item - * - * @param item diskselector item with cursor already set. - * @return the cursor name. - * - * @ingroup Diskselector - */ -EAPI const char * -elm_diskselector_item_cursor_get(const Elm_Diskselector_Item *item) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item, NULL); - return elm_widget_item_cursor_get(item); -} - -/** - * Unset the cursor to be shown when mouse is over the diskselector item - * - * @param item Target item - * - * @see elm_object_cursor_unset() - * @ingroup Diskselector - */ -EAPI void -elm_diskselector_item_cursor_unset(Elm_Diskselector_Item *item) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item); - elm_widget_item_cursor_unset(item); -} - -/** - * Sets a different style for this item cursor. - * - * @note before you set a style you should define a cursor with - * elm_diskselector_item_cursor_set() - * - * @param item diskselector item with cursor already set. - * @param style the theme style to use (default, transparent, ...) - * - * @ingroup Diskselector - */ -EAPI void -elm_diskselector_item_cursor_style_set(Elm_Diskselector_Item *item, const char *style) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item); - elm_widget_item_cursor_style_set(item, style); -} - -/** - * Get the style for this item cursor. - * - * @param item diskselector item with cursor already set. - * @return style the theme style in use, defaults to "default". If the - * object does not have a cursor set, then NULL is returned. - * - * @ingroup Diskselector - */ -EAPI const char * -elm_diskselector_item_cursor_style_get(const Elm_Diskselector_Item *item) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item, NULL); - return elm_widget_item_cursor_style_get(item); -} - -/** - * Set if the cursor set should be searched on the theme or should use - * the provided by the engine, only. - * - * @note before you set if should look on theme you should define a cursor - * with elm_object_cursor_set(). By default it will only look for cursors - * provided by the engine. - * - * @param item widget item with cursor already set. - * @param engine_only boolean to define it cursors should be looked only - * between the provided by the engine or searched on widget's theme as well. - * - * @ingroup Diskselector - */ -EAPI void -elm_diskselector_item_cursor_engine_only_set(Elm_Diskselector_Item *item, Eina_Bool engine_only) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item); - elm_widget_item_cursor_engine_only_set(item, engine_only); -} - -/** - * Get the cursor engine only usage for this item cursor. - * - * @param item widget item with cursor already set. - * @return engine_only boolean to define it cursors should be looked only - * between the provided by the engine or searched on widget's theme as well. If - * the object does not have a cursor set, then EINA_FALSE is returned. - * - * @ingroup Diskselector - */ -EAPI Eina_Bool -elm_diskselector_item_cursor_engine_only_get(const Elm_Diskselector_Item *item) -{ - ELM_DISKSELECTOR_ITEM_CHECK_OR_RETURN(item, EINA_FALSE); - return elm_widget_item_cursor_engine_only_get(item); -} -/** - * Set the number of items to be displayed - * - * @param obj The diskselector object - * @param num The number of itmes that diskselector will display - * - * @ingroup Diskselector - */ EAPI void elm_diskselector_display_item_num_set(Evas_Object *obj, int num) { @@ -1784,3 +1404,12 @@ elm_diskselector_display_item_num_set(Evas_Object *obj, int num) wd->display_item_num = num; wd->display_item_num_by_api = EINA_TRUE; } + +EAPI int +elm_diskselector_display_item_num_get(const Evas_Object *item) +{ + ELM_CHECK_WIDTYPE(item, widtype) (-1); + Widget_Data *wd = elm_widget_data_get(item); + if (!wd) return -1; + return wd->display_item_num; +}