elementary : Backport 83702.

SVN revision: 83706

diff --git a/ChangeLog b/ChangeLog
index 70d77bf87bf708cfb564c7897288a4df2ee76967..936ba3ef89a3f03ac84052d302c8647d64f6b5de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -740,3 +740,6 @@
 
         * Fix a elm_transit crash issue when user delete all target objects in the effect end callback.
 
+2013-02-07  WooHyun Jung
+
+        * elm_entry_single_line_set should not change cnp_mode when PLAINTEXT mode.

diff --git a/NEWS b/NEWS
index 086ac56f8787e0413430b5278684ae86f913af70..3c13ad812a8e82cdeff397871d1c41ba5a0f210c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Fixes:
    * In _timer_cb of elm_notify, access to sd should be forbidden after smart_callback_call is called.
    * Fix the scroll position is calculated by the size of pan object, not the size of scroller.
    * Fix a elm_transit crash issue when user delete all target objects in the effect end callback.
+   * elm_entry_single_line_set should not change cnp_mode when PLAINTEXT mode.
 
 Elementary 1.7.5
 

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 26a7e4c32e01dfddad0ed14374adb09b2ce51843..aa1e7a9138e09591d17f13357976ed51f1958e2a 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -2698,7 +2698,8 @@ elm_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line)
    if (wd->single_line == single_line) return;
    wd->single_line = single_line;
    wd->linewrap = ELM_WRAP_NONE;
-   elm_entry_cnp_mode_set(obj, ELM_CNP_MODE_NO_IMAGE);
+   if (elm_entry_cnp_mode_get(obj) == ELM_CNP_MODE_MARKUP)
+     elm_entry_cnp_mode_set(obj, ELM_CNP_MODE_NO_IMAGE);
    _theme_hook(obj);
    if (wd->scroller)
      {