From 46f28f5231244e8e55c13a48f6972ca7a6a293e3 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Sun, 11 Aug 2013 19:09:49 +0900 Subject: [PATCH] test_genlist.c test_list.c: Added focus highlight animate enable/disable button to genlist and list focus examples. --- legacy/elementary/src/bin/test_genlist.c | 29 +++++++++++++++++++----- legacy/elementary/src/bin/test_list.c | 29 +++++++++++++++++++----- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/legacy/elementary/src/bin/test_genlist.c b/legacy/elementary/src/bin/test_genlist.c index 19c8dc6bd6..b061a8b5a1 100644 --- a/legacy/elementary/src/bin/test_genlist.c +++ b/legacy/elementary/src/bin/test_genlist.c @@ -3299,6 +3299,13 @@ gl20_focus_check_changed(void *data, Evas_Object *obj, void *event_info __UNUSE gl20_focus_on_selection_set(data, obj, nextstate); } +static void +gl20_focus_animate_check_changed(void *data, Evas_Object *obj, void *event_info __UNUSED__) +{ + elm_win_focus_highlight_animate_set((Evas_Object *)data, + elm_check_state_get(obj)); +} + void test_genlist20(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { @@ -3306,13 +3313,16 @@ test_genlist20(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i unsigned lhand, rhand; elm_config_focus_highlight_enabled_set(EINA_TRUE); + elm_config_focus_highlight_animate_set(EINA_TRUE); win = elm_win_util_standard_add("genlist-focus", "Genlist Focus"); elm_win_autodel_set(win, EINA_TRUE); + evas_object_resize(win, 300, 500); + evas_object_show(win); 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); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); gl = elm_genlist_add(win); @@ -3329,14 +3339,24 @@ test_genlist20(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i chk = elm_check_add(win); elm_object_text_set(chk, "Focus on selection"); + evas_object_size_hint_weight_set(chk, EVAS_HINT_EXPAND, 0.0); evas_object_smart_callback_add(chk, "changed", gl20_focus_check_changed, gl); elm_box_pack_end(bx, chk); evas_object_show(chk); - elm_box_pack_end(bxx, bx); - gl20_focus_on_selection_set(gl, chk, EINA_TRUE); + chk = elm_check_add(win); + elm_object_text_set(chk, "Focus Animation"); + elm_check_state_set(chk, EINA_TRUE); + evas_object_size_hint_weight_set(chk, EVAS_HINT_EXPAND, 0.0); + evas_object_smart_callback_add(chk, "changed", + gl20_focus_animate_check_changed, win); + elm_box_pack_end(bx, chk); + evas_object_show(chk); + + elm_box_pack_end(bxx, bx); + itc1 = elm_genlist_item_class_new(); itc1->item_style = "default"; itc1->func.text_get = gl20_text_get; @@ -3370,9 +3390,6 @@ test_genlist20(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i elm_genlist_item_class_free(itc1); elm_genlist_item_class_free(itc4); - - evas_object_resize(win, 300, 500); - evas_object_show(win); } diff --git a/legacy/elementary/src/bin/test_list.c b/legacy/elementary/src/bin/test_list.c index ddf370743e..614b7b810f 100644 --- a/legacy/elementary/src/bin/test_list.c +++ b/legacy/elementary/src/bin/test_list.c @@ -1287,6 +1287,13 @@ test_list8_focus_check_changed(void *data, Evas_Object *obj, void *event_info _ test_list8_focus_on_selection_set(data, obj, nextstate); } +static void +test_list8_focus_animate_check_changed(void *data, Evas_Object *obj, void *event_info __UNUSED__) +{ + elm_win_focus_highlight_animate_set((Evas_Object *)data, + elm_check_state_get(obj)); +} + void test_list_focus(const char *name, const char *title, Eina_Bool horiz) { Evas_Object *win, *li, *bx, *bxx, *chk; @@ -1294,13 +1301,16 @@ void test_list_focus(const char *name, const char *title, Eina_Bool horiz) char buf[256]; elm_config_focus_highlight_enabled_set(EINA_TRUE); + elm_config_focus_highlight_animate_set(EINA_TRUE); win = elm_win_util_standard_add(name, title); elm_win_autodel_set(win, EINA_TRUE); + evas_object_resize(win, 320, 300); + evas_object_show(win); 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); + elm_win_resize_object_add(win, bxx); evas_object_show(bxx); li = elm_list_add(win); @@ -1318,14 +1328,24 @@ void test_list_focus(const char *name, const char *title, Eina_Bool horiz) chk = elm_check_add(win); elm_object_text_set(chk, "Focus on selection"); + evas_object_size_hint_weight_set(chk, EVAS_HINT_EXPAND, 0.0); evas_object_smart_callback_add(chk, "changed", test_list8_focus_check_changed, li); elm_box_pack_end(bx, chk); evas_object_show(chk); - elm_box_pack_end(bxx, bx); - test_list8_focus_on_selection_set(li, chk, EINA_TRUE); + chk = elm_check_add(win); + elm_object_text_set(chk, "Focus Animation"); + elm_check_state_set(chk, EINA_TRUE); + evas_object_size_hint_weight_set(chk, EVAS_HINT_EXPAND, 0.0); + evas_object_smart_callback_add(chk, "changed", + test_list8_focus_animate_check_changed, win); + elm_box_pack_end(bx, chk); + evas_object_show(chk); + + elm_box_pack_end(bxx, bx); + for (idx = 0; _list_focus_combo[idx] >= 0; idx++) { lhand = _list_focus_combo[idx] / 10; @@ -1343,9 +1363,6 @@ void test_list_focus(const char *name, const char *title, Eina_Bool horiz) elm_list_go(li); evas_object_show(li); - - evas_object_resize(win, 320, 300); - evas_object_show(win); } void