diff --git a/legacy/elementary/src/bin/test_gengrid.c b/legacy/elementary/src/bin/test_gengrid.c index 015aaac8a1..5c20db594c 100644 --- a/legacy/elementary/src/bin/test_gengrid.c +++ b/legacy/elementary/src/bin/test_gengrid.c @@ -1,13 +1,35 @@ #include +#include #include "test.h" #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif #ifndef ELM_LIB_QUICKLAUNCH + +static Elm_Gengrid_Item_Class *gic; +static Elm_Gengrid_Item_Class ggic; + +Evas_Object *grid_content_get(void *data, Evas_Object *obj, const char *part); +char *grid_text_get(void *data, Evas_Object *obj __UNUSED__, + const char *part __UNUSED__); +Eina_Bool grid_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, + const char *part __UNUSED__); +void grid_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__); +static Evas_Object *gtt_item_icon(void *data __UNUSED__, Evas_Object *obj __UNUSED__, Evas_Object *tt, void *item __UNUSED__); + +typedef struct _Testitem +{ + Elm_Object_Item *item; + const char *path; + int mode; + int onoff; +} Testitem; + struct _api_data { unsigned int state; /* What state we are testing */ - void *box; /* Use this to get box content */ + Evas_Object *box; /* Use this to get box content */ + Evas_Object *grid; }; typedef struct _api_data api_data; @@ -21,6 +43,13 @@ enum _api_state GRID_PAGE_SIZE, GRID_TOOLTIP_SET_TEXT, GRID_TOOLTIP_UNSET, + GRID_ITEM_CLASS_SET, + GRID_ITEM_UPDATE_SET, + GRID_PAGE_BRING_IN, + GRID_PAGE_SHOW, + GRID_TOOLTIP_CONTENT_CB, + GRID_TOOLTIP_STYLE_SET, + GRID_TOOLTIP_WINDOW_MODE_SET, API_STATE_LAST }; typedef enum _api_state api_state; @@ -95,14 +124,6 @@ _api_bt_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__) elm_object_disabled_set(obj, a->state == API_STATE_LAST); } -typedef struct _Testitem -{ - Elm_Object_Item *item; - const char *path; - int mode; - int onoff; -} Testitem; - static const char *img[9] = { "panel_01.jpg", @@ -116,8 +137,27 @@ static const char *img[9] = "wood_01.jpg", }; -static Elm_Gengrid_Item_Class *gic; -static Elm_Gengrid_Item_Class ggic; +static const char *cur[4] = +{ + ELM_CURSOR_CIRCLE, + ELM_CURSOR_CLOCK, + ELM_CURSOR_COFFEE_MUG, + ELM_CURSOR_CROSS, +}; + +static Evas_Object * +gtt_item_icon(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + Evas_Object *tt, + void *item __UNUSED__) +{ + Evas_Object *ic = elm_icon_add(tt); + char buf[PATH_MAX]; + snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get()); + elm_icon_file_set(ic, buf, NULL); + elm_icon_scale_set(ic, 0, 0); + return ic; +} static int n_current_pic = 0; static void @@ -246,31 +286,36 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e free(data); } -void -test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +static void +always_select_mode_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) { - Evas_Object *win, *bg, *grid, *bt, *bxx; + api_data *api = data; + elm_gengrid_always_select_mode_set(api->grid, elm_check_state_get(obj)); +} + +static void +multi_select_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) +{ + api_data *api = data; + elm_gengrid_multi_select_set(api->grid, elm_check_state_get(obj)); +} + +static void +clear_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +{ + api_data *api = data; + elm_gengrid_clear(api->grid); +} + +static Evas_Object * +create_gengrid(Evas_Object *obj, int items) +{ + Evas_Object *grid = NULL; static Testitem ti[144]; int i, n; char buf[PATH_MAX]; - api_data *api = calloc(1, sizeof(api_data)); - win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC); - elm_win_title_set(win, "GenGrid"); - elm_win_autodel_set(win, EINA_TRUE); - evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); - - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - - bxx = elm_box_add(win); - elm_win_resize_object_add(win, bxx); - evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bxx); - - grid = elm_gengrid_add(win); + grid = elm_gengrid_add(obj); elm_gengrid_item_size_set(grid, 150, 150); elm_gengrid_horizontal_set(grid, EINA_FALSE); elm_gengrid_multi_select_set(grid, EINA_TRUE); @@ -287,16 +332,6 @@ test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL); - api->box = grid; - bt = elm_button_add(win); - elm_object_text_set(bt, "Next API function"); - evas_object_smart_callback_add(bt, "clicked", _api_bt_clicked, (void *) api); - elm_box_pack_end(bxx, bt); - elm_object_disabled_set(bt, api->state == API_STATE_LAST); - evas_object_show(bt); - - elm_box_pack_end(bxx, grid); - gic = elm_gengrid_item_class_new(); gic->item_style = "default"; gic->func.text_get = grid_text_get; @@ -305,7 +340,7 @@ test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf gic->func.del = grid_del; n = 0; - for (i = 0; i < 12 * 12; i++) + for (i = 0; i < items; i++) { snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n]); n = (n + 1) % 9; @@ -315,10 +350,231 @@ test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf if (!(i % 5)) elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE); } - elm_gengrid_item_class_free(gic); + return grid; +} + +static void +restore_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +{ + api_data *api = data; + elm_box_clear(api->box); + api->grid = create_gengrid(obj, (12 * 12)); + elm_box_pack_end(api->box, api->grid); + evas_object_show(api->grid); +} + +static void +filled_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) +{ + Evas_Object *box = (Evas_Object *)data; + Evas_Object *grid; + + elm_box_clear(box); + grid = create_gengrid(box, 1); + elm_gengrid_filled_set(grid, elm_check_state_get(obj)); + elm_box_pack_end(box, grid); evas_object_show(grid); +} + +static void +filled_bt_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +{ + Evas_Object *win, *box, *content_box, *grid, *tg; + + win = elm_win_util_standard_add("test filled", "Test Filled"); + elm_win_autodel_set(win, EINA_TRUE); + + box = elm_box_add(win); + elm_win_resize_object_add(win, box); + evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_show(box); + + content_box = elm_box_add(win); + elm_win_resize_object_add(win, content_box); + evas_object_size_hint_weight_set(content_box, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(content_box, EVAS_HINT_FILL, + EVAS_HINT_FILL); + elm_box_pack_end(box, content_box); + evas_object_show(content_box); + + grid = create_gengrid(win, 1); + elm_box_pack_end(content_box, grid); + evas_object_show(grid); + + tg = elm_check_add(win); + elm_object_text_set(tg, "Filled"); + evas_object_smart_callback_add(tg, "changed", filled_cb, content_box); + elm_box_pack_end(box, tg); + evas_object_show(tg); + + evas_object_resize(win, 450, 200); + evas_object_show(win); +} + +static void +cursor_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) +{ + Evas_Object *grid = (Evas_Object *)data; + Elm_Object_Item *item = NULL; + int i = 0; + + for ((item = elm_gengrid_first_item_get(grid)); item; + (item = elm_gengrid_item_next_get(item))) + { + if(!elm_check_state_get(obj)) + { + elm_gengrid_item_cursor_unset(item); + continue; + } + + elm_gengrid_item_cursor_set(item, cur[i]); + elm_gengrid_item_cursor_engine_only_set(item, EINA_FALSE); + i++; + } +} + +static void +cursor_bt_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +{ + Evas_Object *win, *box, *content_box, *hbox, *grid, *tg; + + win = elm_win_util_standard_add("test cursor", "Test Cursor"); + elm_win_autodel_set(win, EINA_TRUE); + + box = elm_box_add(win); + elm_win_resize_object_add(win, box); + evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_show(box); + + content_box = elm_box_add(win); + elm_win_resize_object_add(win, content_box); + evas_object_size_hint_weight_set(content_box, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(content_box, EVAS_HINT_FILL, + EVAS_HINT_FILL); + elm_box_pack_end(box, content_box); + evas_object_show(content_box); + + grid = create_gengrid(win, 4); + elm_box_pack_end(content_box, grid); + evas_object_show(grid); + + hbox = elm_box_add(win); + elm_box_horizontal_set(hbox, EINA_TRUE); + + tg = elm_check_add(win); + elm_object_text_set(tg, "Cursor"); + evas_object_smart_callback_add(tg, "changed", cursor_cb, grid); + elm_box_pack_end(hbox, tg); + evas_object_show(tg); + + elm_box_pack_end(box, hbox); + evas_object_show(hbox); + + evas_object_resize(win, 450, 450); + evas_object_show(win); +} + +void +test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +{ + Evas_Object *win, *bg, *bt, *content_box, *bxx, *bx, *tg; + api_data *api = calloc(1, sizeof(api_data)); + + win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC); + elm_win_title_set(win, "GenGrid"); + elm_win_autodel_set(win, EINA_TRUE); + evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); + + bg = elm_bg_add(win); + evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, bg); + evas_object_show(bg); + + bxx = elm_box_add(win); + api->box = bxx; + elm_win_resize_object_add(win, bxx); + evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_show(bxx); + + content_box = elm_box_add(win); + api->box = content_box; + evas_object_size_hint_weight_set(content_box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(content_box, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_show(content_box); + + /* Create GenGrid */ + api->grid = create_gengrid(win, (12 * 12)); + + bt = elm_button_add(win); + elm_object_text_set(bt, "Next API function"); + evas_object_smart_callback_add(bt, "clicked", _api_bt_clicked, + (void *)api); + elm_box_pack_end(bxx, bt); + elm_object_disabled_set(bt, api->state == API_STATE_LAST); + evas_object_show(bt); + + elm_box_pack_end(content_box, api->grid); + elm_box_pack_end(bxx, content_box); + evas_object_show(api->grid); + + bx = elm_box_add(win); + elm_box_horizontal_set(bx, EINA_TRUE); + elm_box_pack_end(bxx, bx); + evas_object_show(bx); + + /* Gengrid Always Select Mode Test */ + tg = elm_check_add(win); + evas_object_size_hint_weight_set(tg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(tg, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_object_text_set(tg, "Always Select Mode"); + evas_object_smart_callback_add(tg, "changed", always_select_mode_cb, + (void *)api); + elm_box_pack_end(bx, tg); + evas_object_show(tg); + + tg = elm_check_add(win); + evas_object_size_hint_weight_set(tg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(tg, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_object_text_set(tg, "Multi Select Mode"); + elm_check_state_set(tg, EINA_TRUE); + evas_object_smart_callback_add(tg, "changed", multi_select_cb, + (void *)api); + elm_box_pack_end(bx, tg); + evas_object_show(tg); + + /* Gengrid Clear Test */ + bt = elm_button_add(win); + elm_object_text_set(bt, "Clear"); + evas_object_smart_callback_add(bt, "clicked", clear_bt_clicked, + (void *)api); + elm_box_pack_end(bx, bt); + evas_object_show(bt); + + bt = elm_button_add(win); + elm_object_text_set(bt, "Restore"); + evas_object_smart_callback_add(bt, "clicked", restore_bt_clicked, + (void *) api); + elm_box_pack_end(bx, bt); + evas_object_show(bt); + + /* Gengrid Filled Test */ + bt = elm_button_add(win); + elm_object_text_set(bt, "Check Filled"); + evas_object_smart_callback_add(bt, "clicked", filled_bt_clicked, NULL); + elm_box_pack_end(bx, bt); + evas_object_show(bt); + + /* Item Cursor Test */ + bt = elm_button_add(win); + elm_object_text_set(bt, "Check Cursor"); + evas_object_smart_callback_add(bt, "clicked", cursor_bt_clicked, + (void *) api); + elm_box_pack_end(bx, bt); + evas_object_show(bt); evas_object_resize(win, 600, 600); evas_object_show(win); @@ -344,6 +600,30 @@ _before_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __U NULL); } +static int +compare_cb(const void *data1, const void *data2) +{ + Testitem *ti1 = (Testitem *)data1; + Testitem *ti2 = (Testitem *)data2; + return strlen(ti1->path) - strlen(ti2->path); +} + +static void +_sorted_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +{ + Testitem *ti; + Evas_Object *grid = data; + char buf[PATH_MAX]; + + snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n_current_pic]); + n_current_pic = ((n_current_pic +1) % 9); + ti = calloc(1, sizeof(*ti)); + ti->mode = 0; + ti->path = eina_stringshare_add(buf); + ti->item = elm_gengrid_item_sorted_insert(grid, gic, ti, compare_cb, grid_sel, + NULL); +} + static void _after_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { @@ -474,6 +754,12 @@ test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_box_pack_end(hbx, bt); evas_object_show(bt); + bt = elm_button_add(win); + elm_object_text_set(bt, "Sorted insert"); + evas_object_smart_callback_add(bt, "clicked", _sorted_bt_clicked, grid); + elm_box_pack_end(hbx, bt); + evas_object_show(bt); + bt = elm_button_add(win); elm_object_text_set(bt, "Delete"); evas_object_smart_callback_add(bt, "clicked", _delete_bt_clicked, grid); diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c index 0a5ff34e00..50173e1af8 100644 --- a/legacy/elementary/src/lib/elm_gengrid.c +++ b/legacy/elementary/src/lib/elm_gengrid.c @@ -130,6 +130,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, ""}, @@ -923,6 +924,16 @@ _item_highlight(Elm_Gen_Item *it) 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) { @@ -1042,6 +1053,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)) @@ -1442,6 +1455,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) { @@ -2093,6 +2118,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); @@ -2118,6 +2145,8 @@ 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); @@ -2145,6 +2174,9 @@ 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); @@ -2172,6 +2204,9 @@ 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); @@ -2203,6 +2238,8 @@ 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); @@ -2938,3 +2975,11 @@ elm_gengrid_hilight_mode_get(const Evas_Object *obj) return elm_genlist_hilight_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; +} diff --git a/legacy/elementary/src/lib/elm_gengrid.h b/legacy/elementary/src/lib/elm_gengrid.h index 84ea7d4d65..929c70d02b 100644 --- a/legacy/elementary/src/lib/elm_gengrid.h +++ b/legacy/elementary/src/lib/elm_gengrid.h @@ -800,8 +800,15 @@ EAPI void elm_gengrid_item_item_class_update(Elm_Object */ EAPI const Elm_Gengrid_Item_Class *elm_gengrid_item_item_class_get(const Elm_Object_Item *it); -//XXX: Let's add -//EAPI int elm_gengrid_item_index_get(const Elm_Object_Item *it); +/** + * Get the index of the item. It is only valid once displayed. + * + * @param it a gengrid item + * @return the position inside the list of item. + * + * @ingroup Gengrid + */ +EAPI int elm_gengrid_item_index_get(const Elm_Object_Item *it); /** * Return how many items are currently in a list