From: Xie Ligang Date: Mon, 12 Mar 2018 09:33:22 +0000 (+0800) Subject: Fix the issue of the wrong language label display when change the language X-Git-Tag: accepted/tizen/unified/20180313.061043~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F69%2F172169%2F1;p=platform%2Fcore%2Fuifw%2Fise-default.git Fix the issue of the wrong language label display when change the language Change-Id: Idc87f81dc7dfe4b0951c43ad30d7e8cce3ea634f --- diff --git a/src/ise-language-change.cpp b/src/ise-language-change.cpp index 2d114c7..b7199a6 100644 --- a/src/ise-language-change.cpp +++ b/src/ise-language-change.cpp @@ -107,6 +107,15 @@ void ise_show_space_flick_language_change_popup(short int space_button_x, short return; scluint num = _language_manager.get_enabled_languages_num(); + +#ifdef _WEARABLE + if (num <= 1) { + return; + } else { + left_text = _language_manager.get_current_language(); + center_text = _language_manager.get_next_language(); + } +#else if (num <= 1) { return; } else if (num == 2) { @@ -126,6 +135,7 @@ void ise_show_space_flick_language_change_popup(short int space_button_x, short center_text = _language_manager.get_current_language(); right_text = _language_manager.get_previous_language(); } +#endif __ise_init_space_flick_lang_change_popup_variables(space_button_x, space_button_y, space_button_width, space_button_height); @@ -216,6 +226,8 @@ void ise_show_space_flick_language_change_popup(short int space_button_x, short evas_object_size_hint_min_set(label2, scroller_area_width, scroller_area_height); elm_table_pack(_table, label2, scroller_area_width, 0, scroller_area_width, scroller_area_height); +#ifdef _WEARABLE +#else Evas_Object *label3 = edje_object_add(evas_object_evas_get(win)); evas_object_show(label3); evas_object_layer_set(label3, EVAS_LAYER_MAX); @@ -223,6 +235,7 @@ void ise_show_space_flick_language_change_popup(short int space_button_x, short edje_object_part_text_set(label3, "language_name", right_text.c_str()); evas_object_size_hint_min_set(label3, scroller_area_width, scroller_area_height); elm_table_pack(_table, label3, scroller_area_width * 2, 0, scroller_area_width, scroller_area_height); +#endif evas_object_show(img_arrow_left); evas_object_show(img_arrow_right);