From: Jihoon Kim Date: Mon, 12 Dec 2016 08:21:48 +0000 (+0900) Subject: Fix bug keyboard does not switch when pressing radio button X-Git-Tag: submit/tizen_3.0/20161212.101517~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F72%2F104072%2F1;p=platform%2Fcore%2Fuifw%2Finputmethod-setting.git Fix bug keyboard does not switch when pressing radio button Change-Id: I0a9250e6b9a6e9cfcf510c3a7ed57ccb7dae7f57 Signed-off-by: Jihoon Kim --- diff --git a/im_setting_list/input_method_setting_list_popup_view.cpp b/im_setting_list/input_method_setting_list_popup_view.cpp index bf52044..e444d63 100644 --- a/im_setting_list/input_method_setting_list_popup_view.cpp +++ b/im_setting_list/input_method_setting_list_popup_view.cpp @@ -106,16 +106,6 @@ static void im_setting_list_load_active_ime_info(void) } } -static void im_setting_list_radio_change_cb(void *data, Evas_Object *obj, void *event_info) -{ - /*save the checked ime*/ - int index = (int)reinterpret_cast(data); - if (index < 0 || index >= (int)g_active_ime_info_list.size()) { - LOGW("Wrong value. index : %d, g_active_ime_info_list.size() : %d\n", index, g_active_ime_info_list.size()); - return; - } -} - static void im_setting_list_update_radio_state(Elm_Object_Item *item, Evas_Object *obj, int index) { if (index < 0 || index >= (int)g_active_ime_info_list.size()) { @@ -131,7 +121,7 @@ static void im_setting_list_update_radio_state(Elm_Object_Item *item, Evas_Objec radio = elm_object_item_part_content_get(item, "elm.icon"); } evas_object_data_set(radio, "parent_genlist", obj); - elm_radio_value_set(radio, index); + elm_radio_value_set(group_radio, index); } } @@ -239,10 +229,9 @@ static Evas_Object *im_setting_list_genlist_item_icon_get(void *data, Evas_Objec Evas_Object *radio = elm_radio_add(obj); elm_object_style_set(radio, "list"); elm_radio_state_value_set(radio, index); - evas_object_propagate_events_set(radio, EINA_FALSE); + evas_object_propagate_events_set(radio, EINA_TRUE); elm_radio_group_add(radio, group_radio); evas_object_show(radio); - evas_object_smart_callback_add(radio, "changed", im_setting_list_radio_change_cb, (void *) (index)); return radio; } diff --git a/im_setting_selector/input_method_setting_selector_ui.cpp b/im_setting_selector/input_method_setting_selector_ui.cpp index 8eb8208..3677b5d 100755 --- a/im_setting_selector/input_method_setting_selector_ui.cpp +++ b/im_setting_selector/input_method_setting_selector_ui.cpp @@ -191,16 +191,6 @@ static void im_setting_selector_select_keyboard_cb(void *data, Evas_Object *obj, } #endif -static void im_setting_selector_radio_change_cb(void *data, Evas_Object *obj, void *event_info) -{ - /*save the checked ime*/ - int index = (int)reinterpret_cast(data); - if (index < 0 || index >= (int)g_ime_info_list.size()) { - LOGW("Wrong value. index : %d, g_ime_info_list.size() : %d\n", index, g_ime_info_list.size()); - return; - } -} - static void im_setting_selector_update_radio_state(Elm_Object_Item *item, Evas_Object *obj, int index) { if (index < 0 || index >= (int)g_ime_info_list.size()) { @@ -216,7 +206,7 @@ static void im_setting_selector_update_radio_state(Elm_Object_Item *item, Evas_O radio = elm_object_item_part_content_get(item, "elm.icon"); } evas_object_data_set(radio, "parent_genlist", obj); - elm_radio_value_set(radio, index); + elm_radio_value_set(group_radio, index); } } @@ -300,10 +290,9 @@ static Evas_Object *im_setting_selector_genlist_item_icon_get(void *data, Evas_O Evas_Object *radio = elm_radio_add(obj); elm_object_style_set(radio, "list"); elm_radio_state_value_set(radio, index); - evas_object_propagate_events_set(radio, EINA_FALSE); + evas_object_propagate_events_set(radio, EINA_TRUE); elm_radio_group_add(radio, group_radio); evas_object_show(radio); - evas_object_smart_callback_add(radio, "changed", im_setting_selector_radio_change_cb, (void *) (index)); return radio; }