From: Jihoon Kim Date: Wed, 10 Mar 2021 04:34:16 +0000 (+0900) Subject: Show keyboard list for enabling in common profile X-Git-Tag: submit/tizen/20210310.061319~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9da82c8ea52247a1710cd38e00683aa9e74ce3a4;p=platform%2Fcore%2Fuifw%2Finputmethod-setting.git Show keyboard list for enabling in common profile Change-Id: I359e22063ce3387f37d9d687ea17ec215aef1eb7 Signed-off-by: Jihoon Kim --- diff --git a/common/input_method_setting_genlist.cpp b/common/input_method_setting_genlist.cpp index 58d093f..9c6fd7a 100644 --- a/common/input_method_setting_genlist.cpp +++ b/common/input_method_setting_genlist.cpp @@ -26,17 +26,31 @@ static Eext_Circle_Surface *surface = NULL; static void gl_realized_cb(void *data, Evas_Object *obj, void *event_info) { Elm_Object_Item *it = (Elm_Object_Item *)event_info; - Elm_Object_Item *first_item = elm_genlist_first_item_get(obj); - Elm_Object_Item *last_item = elm_genlist_last_item_get(obj); + Elm_Object_Item *previous = elm_genlist_item_prev_get(it); + Elm_Object_Item *next = elm_genlist_item_next_get(it); + bool first_in_group = false, last_in_group = false; - if (it == first_item && it == last_item) + if (previous) { + if (elm_genlist_item_type_get(previous) == ELM_GENLIST_ITEM_GROUP) + first_in_group = true; + } else + first_in_group = true; + + if (next) { + if (elm_genlist_item_type_get(next) == ELM_GENLIST_ITEM_GROUP) + last_in_group = true; + } else + last_in_group = true; + + if (first_in_group && last_in_group) { elm_object_item_signal_emit(it, "elm,state,group,single", "elm"); - else if (it == first_item) + } else if (first_in_group) { elm_object_item_signal_emit(it, "elm,state,group,top", "elm"); - else if (it == last_item) + } else if (last_in_group) { elm_object_item_signal_emit(it, "elm,state,group,bottom", "elm"); - else + } else { elm_object_item_signal_emit(it, "elm,state,group,middle", "elm"); + } } #endif diff --git a/im_setting_list/input_method_setting_list_ui.cpp b/im_setting_list/input_method_setting_list_ui.cpp index 48c6d95..c24c2c7 100644 --- a/im_setting_list/input_method_setting_list_ui.cpp +++ b/im_setting_list/input_method_setting_list_ui.cpp @@ -512,11 +512,12 @@ static Evas_Object *im_setting_list_genlist_keyboard_list_item_icon_get(void *da Evas_Object *ck = elm_check_add(obj); elm_object_style_set(ck, "on&off"); elm_check_state_set(ck, g_gen_item_data[index].chk_status); -#ifdef _MOBILE - elm_object_disabled_set(ck, g_ime_info_list[index].is_preinstalled || (index == g_active_ime_index)); -#else +#ifdef _WEARABLE elm_object_disabled_set(ck, EINA_TRUE); +#else + elm_object_disabled_set(ck, g_ime_info_list[index].is_preinstalled || (index == g_active_ime_index)); #endif + evas_object_propagate_events_set(ck, EINA_FALSE); evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -595,7 +596,7 @@ static void im_setting_list_genlist_item_class_create(int app_type) itc_im_list_keyboard_list = elm_genlist_item_class_new(); if (itc_im_list_keyboard_list) { - itc_im_list_keyboard_list->item_style = IME_SETTING_LIST_2LINE_STYLE; + itc_im_list_keyboard_list->item_style = IME_SETTING_LIST_1LINE_STYLE; itc_im_list_keyboard_list->func.text_get = im_setting_list_genlist_keyboard_list_item_label_get; itc_im_list_keyboard_list->func.content_get = im_setting_list_genlist_keyboard_list_item_icon_get; itc_im_list_keyboard_list->func.state_get = NULL; @@ -715,7 +716,7 @@ static void im_setting_list_add_ime(void *data) { elm_object_item_disabled_set(item, !(g_ime_info_list[g_active_ime_index].has_option)); -#ifdef _MOBILE +#ifndef _WEARABLE /* Keyboards group */ Elm_Object_Item *group_header_item = NULL; group_header_item = elm_genlist_item_append(ad->genlist, @@ -730,7 +731,7 @@ static void im_setting_list_add_ime(void *data) { #endif } -#ifndef _MOBILE +#ifdef _WEARABLE if (ad->app_type == APP_TYPE_NORMAL) #endif {