jihoon pushed a commit to branch master.
commit 2e0859f112743f15c0a7e6253d89a9e557ad880c
Author: Jihoon Kim <[email protected]>
Date: Thu Apr 25 09:45:15 2013 +0900
edje entry: remove duplicated ecore_imf_context_reset in adjusting the
selection
---
ChangeLog | 4 ++++
NEWS | 1 +
src/lib/edje/edje_entry.c | 7 ++-----
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0e58b11..b72e9e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-25 Jihoon Kim
+
+ * Edje entry: remove duplicated ecore_imf_context_reset in adjusting
the selection
+
2013-04-22 Mike Blumenkrantz
* Evas: Fix recursive proxy image rendering to just render black
diff --git a/NEWS b/NEWS
index e0c00a7..a62f6d3 100644
--- a/NEWS
+++ b/NEWS
@@ -155,6 +155,7 @@ Improvements:
* Embryo: use eina_file_mkstemp().
* Evas textblock : Added split cursor for BiDi text
* Evas works around MESA/intel xorg bug where alpha channel of non-argb
windows is not filled in with 0xff.
+ * edje entry: remove duplicated ecore_imf_context_reset in adjusting the
selection
Fixes:
* Fix a memory leak in ecore_con_dns when using ecore_con_server_connect
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index 193f712..f8ce36c 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -538,6 +538,8 @@ _sel_enable(Edje *ed, Evas_Textblock_Cursor *c EINA_UNUSED,
free(en->selection);
en->selection = NULL;
}
+
+ _edje_entry_imf_context_reset(en->rp);
_edje_emit(ed, "selection,start", en->rp->part->name);
}
@@ -545,7 +547,6 @@ static void
_sel_extend(Edje *ed, Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
{
if (!en->sel_end) return;
- _edje_entry_imf_context_reset(en->rp);
_sel_enable(ed, c, o, en);
if (!evas_textblock_cursor_compare(c, en->sel_end)) return;
evas_textblock_cursor_copy(c, en->sel_end);
@@ -564,7 +565,6 @@ static void
_sel_preextend(Edje *ed, Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
{
if (!en->sel_end) return;
- _edje_entry_imf_context_reset(en->rp);
_sel_enable(ed, c, o, en);
if (!evas_textblock_cursor_compare(c, en->sel_start)) return;
evas_textblock_cursor_copy(c, en->sel_start);
@@ -2786,8 +2786,6 @@ _edje_entry_select_begin(Edje_Real_Part *rp)
en = rp->typedata.text->entry_data;
if (!en) return;
- _edje_entry_imf_context_reset(rp);
-
_sel_clear(en->ed, en->cursor, rp->object, en);
_sel_enable(en->ed, en->cursor, rp->object, en);
_sel_start(en->cursor, rp->object, en);
@@ -2805,7 +2803,6 @@ _edje_entry_select_extend(Edje_Real_Part *rp)
(!rp->typedata.text)) return;
en = rp->typedata.text->entry_data;
if (!en) return;
- _edje_entry_imf_context_reset(rp);
_sel_extend(en->ed, en->cursor, rp->object, en);
_edje_entry_real_part_configure(en->ed, rp);
--
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
