aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJihoon Kim <jihoon48.kim@samsung.com>2013-04-19 14:46:42 +0900
committerJihoon Kim <jihoon48.kim@samsung.com>2013-04-19 14:46:42 +0900
commit6e767dd75bc7ddeeedf341d6a2e22b03f23077cf (patch)
treeb679efaa4a3501a32fdcb9a10eceb94c977c2ea3
parentecore_evas/wayland: Actually, the frame object should be on LAYER_MIN. (diff)
downloadefl-6e767dd75bc7ddeeedf341d6a2e22b03f23077cf.tar.gz
edje: remove useless ecore_imf_context_reset call in case of pressing ESC and Return key
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/edje/edje_entry.c4
3 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 322a1838c7..3ad1ad47d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-19 Jihoon Kim (jihoon)
+
+ * Edje: Remove code to call ecore_imf_context_reset in case of pressing ESC, Return key
+
2013-04-14 Carsten Haitzler (The Rasterman)
* Evas: Fix evas gl_x11 to use default depth when visual
diff --git a/NEWS b/NEWS
index ba08f8beb4..7d301190b0 100644
--- a/NEWS
+++ b/NEWS
@@ -250,3 +250,4 @@ Fixes:
* Evas textblock: Fixed a bug with deletion of ranges that end just a visual format.
* Evas: If an object goes to be hidden without replacing the cur/prev state info, the object context can be corrupted at the next show time. Now it replaces the cur/prev in that rare case.
* Evas: Fix evas gl_x11 in 16bpp and lower depths than 24/32 bpp.
+ * Edje: Fix useless ecore_imf_context_reset call in case of pressing ESC and Return key
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index 102f0f3d3e..f6611da469 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -1320,10 +1320,6 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
}
#endif
- if ((!strcmp(ev->keyname, "Escape")) ||
- (!strcmp(ev->keyname, "Return")) || (!strcmp(ev->keyname, "KP_Enter")))
- _edje_entry_imf_context_reset(rp);
-
old_cur_pos = evas_textblock_cursor_pos_get(en->cursor);
control = evas_key_modifier_is_set(ev->modifiers, "Control");