summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInBum Chang <ibchang@samsung.com>2012-09-04 17:35:16 +0900
committerGerrit Code Review <gerrit2@localhost>2012-09-04 17:35:16 +0900
commit293731a76ebceeda137d46ce3990d0cf2555b6aa (patch)
tree477a5f7624b03a10726acacdc2982fa2fc414a56
parent4e2d448220ac0518223e4f90063f8a37de6f48a1 (diff)
parentce87051e113ac35a101f01b4de508b51c3c847fc (diff)
downloadorg.tizen.browser-293731a76ebceeda137d46ce3990d0cf2555b6aa.tar.gz
org.tizen.browser-293731a76ebceeda137d46ce3990d0cf2555b6aa.tar.bz2
org.tizen.browser-293731a76ebceeda137d46ce3990d0cf2555b6aa.zip
Merge "[Title] hiding the guide text when the input field is not empty." into 2.0_beta
-rwxr-xr-xsrc/browser-history/browser-history-layout.cpp2
-rwxr-xr-xsrc/browser-utility.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/browser-history/browser-history-layout.cpp b/src/browser-history/browser-history-layout.cpp
index e0b4daa..a593bd3 100755
--- a/src/browser-history/browser-history-layout.cpp
+++ b/src/browser-history/browser-history-layout.cpp
@@ -258,6 +258,8 @@ void Browser_History_Layout::__search_delay_changed_cb(void *data, Evas_Object *
return;
Browser_History_Layout *history_layout = (Browser_History_Layout *)data;
+ if (!elm_entry_is_empty(obj))
+ elm_object_signal_emit(history_layout->m_searchbar, "elm,state,guidetext,hide", "elm");
if (!history_layout->_show_searched_history(utf8_text))
BROWSER_LOGE("_show_searched_history failed");
diff --git a/src/browser-utility.cpp b/src/browser-utility.cpp
index 0f7510f..bcc66b7 100755
--- a/src/browser-utility.cpp
+++ b/src/browser-utility.cpp
@@ -222,9 +222,10 @@ static void __searchbar_changed_cb(void *data, Evas_Object *obj, void *event_inf
elm_object_signal_emit(layout, "elm,state,eraser,hide", "elm");
else {
elm_object_signal_emit(layout, "elm,state,eraser,show", "elm");
- elm_object_signal_emit(layout, "elm,state,guidetext,hide", "elm");
}
}
+ if (!elm_entry_is_empty(obj))
+ elm_object_signal_emit(layout, "elm,state,guidetext,hide", "elm");
}
static void __searchbar_focused_cb(void *data, Evas_Object *obj, void *event_info)