From cd27db46c32cb33d147cd14a52b131a9bfdd3097 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Thu, 7 May 2020 21:05:30 +0900 Subject: [PATCH] Apply GUI changes for IoT headed Change-Id: I15970475df5a5ca0f861875e9dc9423a8f8e747d Signed-off-by: Jihoon Kim --- .../input_method_setting_list_popup_view.cpp | 6 +++++- im_setting_list/input_method_setting_list_ui.cpp | 12 +++++++++--- .../input_method_setting_selector_ui.cpp | 4 +++- 3 files changed, 17 insertions(+), 5 deletions(-) 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 49f806d..c191605 100644 --- a/im_setting_list/input_method_setting_list_popup_view.cpp +++ b/im_setting_list/input_method_setting_list_popup_view.cpp @@ -278,8 +278,10 @@ static void im_setting_list_genlist_item_class_create(void) if (itc_im_list) { #ifdef _WEARABLE itc_im_list->item_style = "1text.1icon.1"; -#else +#elif _MOBILE itc_im_list->item_style = "type1"; +#else + itc_im_list->item_style = "1line"; #endif itc_im_list->func.text_get = im_setting_list_genlist_item_label_get; itc_im_list->func.content_get = im_setting_list_genlist_item_icon_get; @@ -357,7 +359,9 @@ static Evas_Object *im_setting_list_popup_create(void *data) elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0); evas_object_smart_callback_add(popup, "block,clicked", im_setting_list_popup_block_clicked_cb, data); elm_object_domain_translatable_part_text_set(popup, "title,text", PACKAGE, IM_SETTING_LIST_POPUP_VIEW_TITLE); +#if defined(_MOBILE) || defined(_WEARABLE) elm_object_style_set(popup, "theme_bg"); +#endif eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, im_setting_list_popup_view_back_cb, data); ad->popup = popup; diff --git a/im_setting_list/input_method_setting_list_ui.cpp b/im_setting_list/input_method_setting_list_ui.cpp index 6d66085..36e4db1 100644 --- a/im_setting_list/input_method_setting_list_ui.cpp +++ b/im_setting_list/input_method_setting_list_ui.cpp @@ -684,8 +684,10 @@ static void im_setting_list_genlist_item_class_create(int app_type) { #ifdef _WEARABLE itc_im_list_keyboard_list->item_style = "1text.1icon.1"; -#else +#elif _MOBILE itc_im_list_keyboard_list->item_style = "type1"; +#else + itc_im_list_keyboard_list->item_style = "2line"; #endif 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; @@ -715,8 +717,10 @@ static void im_setting_list_genlist_item_class_create(int app_type) { #ifdef _WEARABLE itc_im_list_item->item_style = "2text"; -#else +#elif _MOBILE itc_im_list_item->item_style = "type1"; +#else + itc_im_list_item->item_style = "2line"; #endif itc_im_list_item->func.text_get = im_setting_list_genlist_item_label_get; itc_im_list_item->func.content_get = NULL; @@ -732,8 +736,10 @@ static void im_setting_list_genlist_item_class_create(int app_type) { #ifdef _WEARABLE itc_im_list_item_one_line->item_style = "1text"; -#else +#elif _MOBILE itc_im_list_item_one_line->item_style = "type1"; +#else + itc_im_list_item_one_line->item_style = "1line"; #endif itc_im_list_item_one_line->func.text_get = im_setting_list_genlist_item_one_line_label_get; itc_im_list_item_one_line->func.content_get = NULL; diff --git a/im_setting_selector/input_method_setting_selector_ui.cpp b/im_setting_selector/input_method_setting_selector_ui.cpp index a22245d..516c364 100644 --- a/im_setting_selector/input_method_setting_selector_ui.cpp +++ b/im_setting_selector/input_method_setting_selector_ui.cpp @@ -293,8 +293,10 @@ static void im_setting_selector_genlist_item_class_create(void) if (itc_im_selector) { #ifdef _WEARABLE itc_im_selector->item_style = "1text.1icon.1"; -#else +#elif _MOBILE itc_im_selector->item_style = "type1"; +#else + itc_im_selector->item_style = "1line"; #endif itc_im_selector->func.text_get = im_setting_selector_genlist_item_label_get; itc_im_selector->func.content_get = im_setting_selector_genlist_item_icon_get; -- 2.34.1