From 89ac13967d1f0c71e8de8db5b4cc9132c4916a39 Mon Sep 17 00:00:00 2001 From: Kairong Yin Date: Fri, 7 Sep 2012 20:56:06 -0700 Subject: [PATCH] Fix N_SE-9270,N_SE-9282 and the max limition string Change-Id: Ie8f15d922c8e75443a125a8053543d101ff8ca30 --- setting-about/src/setting-about-main.c | 11 ++++++----- setting-common/src/setting-common-draw-genlist.c | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/setting-about/src/setting-about-main.c b/setting-about/src/setting-about-main.c index 50f84e6..f1d2bb8 100755 --- a/setting-about/src/setting-about-main.c +++ b/setting-about/src/setting-about-main.c @@ -139,8 +139,8 @@ static void __device_name_changed_cb(void *data, Evas_Object *obj) if (!ad->empty_flag) { ad->empty_flag = TRUE; - elm_entry_context_menu_disabled_set(obj, TRUE); //disable the copy&paste&search popup - elm_entry_magnifier_disabled_set(obj, TRUE); + //elm_entry_context_menu_disabled_set(obj, TRUE); //disable the copy&paste&search popup + //elm_entry_magnifier_disabled_set(obj, TRUE); Elm_Object_Item *navi_it = elm_naviframe_top_item_get(ad->navi_bar); if (navi_it) { @@ -160,8 +160,8 @@ static void __device_name_changed_cb(void *data, Evas_Object *obj) if (ad->empty_flag) { ad->empty_flag = FALSE; - elm_entry_context_menu_disabled_set(obj, FALSE); //enable the copy&paste&search popup - elm_entry_magnifier_disabled_set(obj, FALSE); + //elm_entry_context_menu_disabled_set(obj, FALSE); //enable the copy&paste&search popup + //elm_entry_magnifier_disabled_set(obj, FALSE); Elm_Object_Item *navi_it = elm_naviframe_top_item_get(ad->navi_bar); if (navi_it) { @@ -509,10 +509,11 @@ static void __entry_unfocus_cb(void *data, Evas_Object *obj, void *event_info) Setting_GenGroupItem_Data *item_dev_name = data; SettingAboutUG *ad = item_dev_name->userdata; __device_name_changed_cb(item_dev_name, item_dev_name->eo_check); +#if 0 //after unfocus,need updating.. elm_object_item_data_set(item_dev_name->item, item_dev_name); elm_genlist_item_update(item_dev_name->item); - +#endif if(ad->navi_item && elm_object_item_part_content_get(ad->navi_item, "title_right_btn")) { diff --git a/setting-common/src/setting-common-draw-genlist.c b/setting-common/src/setting-common-draw-genlist.c index f680703..9b2a94f 100755 --- a/setting-common/src/setting-common-draw-genlist.c +++ b/setting-common/src/setting-common-draw-genlist.c @@ -24,7 +24,7 @@ #include #include -#define EXCEED_LIMITATION_STR "Name is too long." +#define EXCEED_LIMITATION_STR "The content is too long." static Evas_Object *_gl_Gendial_content_get(void *data, Evas_Object *obj, const char *part); static char *_gl_Gendial_text_get(void *data, Evas_Object *obj, const char *part); @@ -131,9 +131,9 @@ static void __entry_changed(void *data, Evas_Object *obj, void *event_info) } else { + elm_object_signal_emit(entry_container, "elm,state,guidetext,hide", "elm"); if (elm_object_focus_get(obj)) //only do when entry is focused { - elm_object_signal_emit(entry_container, "elm,state,guidetext,hide", "elm"); elm_object_signal_emit(entry_container, "elm,state,eraser,show", "elm"); } } -- 2.7.4