From a62ea495b6f1e3d870fb28dff21e31c9a12176ba Mon Sep 17 00:00:00 2001 From: "yigang.jing" Date: Tue, 18 Dec 2012 17:04:30 +0800 Subject: [PATCH] Fix N_SE-13040: set Name as single line in About . Change-Id: Iac26c0af954525b94e2530774aecaf144d48e827 --- setting-about/src/setting-about-main.c | 2 +- setting-common/src/setting-common-draw-genlist.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/setting-about/src/setting-about-main.c b/setting-about/src/setting-about-main.c index f86097e..f42b256 100755 --- a/setting-about/src/setting-about-main.c +++ b/setting-about/src/setting-about-main.c @@ -692,7 +692,7 @@ int setting_about_generate_genlist(void *data) __setting_about_device_name_changed_cb); if (ad->item_dev_name) { ad->item_dev_name->userdata = ad; - ad->item_dev_name->isSinglelineFlag = 0; + ad->item_dev_name->isSinglelineFlag = TRUE; ad->item_dev_name->start_change_cb = (setting_call_back_func)__entry_key_down_cb; ad->item_dev_name->stop_change_cb = __entry_unfocus_cb; ad->item_dev_name->maxlength_reached_cb = __max_len_reached; diff --git a/setting-common/src/setting-common-draw-genlist.c b/setting-common/src/setting-common-draw-genlist.c index d42532c..cc64992 100755 --- a/setting-common/src/setting-common-draw-genlist.c +++ b/setting-common/src/setting-common-draw-genlist.c @@ -230,10 +230,12 @@ static void __entry_keydown(void *data, Evas *e, Evas_Object *obj, void *event_i list_item->enterKeyPressFlag = true; //hide the eraser button //format like:xx
- const char *entry_str = remove_first_substring(elm_entry_entry_get(obj), "
"); - elm_entry_entry_set(obj, entry_str); - FREE(entry_str); - elm_entry_cursor_end_set(obj); + if (list_item->isSinglelineFlag == FALSE) { + const char *entry_str = remove_first_substring(elm_entry_entry_get(obj), "
"); + elm_entry_entry_set(obj, entry_str); + FREE(entry_str); + elm_entry_cursor_end_set(obj); + } setting_hide_input_pannel_cb(obj); } else { list_item->enterKeyPressFlag = false; @@ -505,6 +507,7 @@ static Evas_Object *__add_entry(Setting_GenGroupItem_Data *item_data, Evas_Objec item_data->input_type); if (item_data->isSinglelineFlag) { + elm_entry_scrollable_set(entry, EINA_TRUE); elm_entry_single_line_set(entry, EINA_TRUE); } -- 2.7.4