summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJihoon Kim <jihoon48.kim@samsung.com>2013-04-25 09:45:15 +0900
committerJihoon Kim <jihoon48.kim@samsung.com>2013-04-25 09:46:19 +0900
commit2e0859f112743f15c0a7e6253d89a9e557ad880c (patch)
treee58c136e2fb693bba38f42b21003aef375f8ea9d
parent80e04b2842872b10b4ed02aae330bdd3510f009f (diff)
edje entry: remove duplicated ecore_imf_context_reset in adjusting the selection
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/edje/edje_entry.c7
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 @@
12013-04-25 Jihoon Kim
2
3 * Edje entry: remove duplicated ecore_imf_context_reset in adjusting the selection
4
12013-04-22 Mike Blumenkrantz 52013-04-22 Mike Blumenkrantz
2 6
3 * Evas: Fix recursive proxy image rendering to just render black 7 * 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:
155 * Embryo: use eina_file_mkstemp(). 155 * Embryo: use eina_file_mkstemp().
156 * Evas textblock : Added split cursor for BiDi text 156 * Evas textblock : Added split cursor for BiDi text
157 * Evas works around MESA/intel xorg bug where alpha channel of non-argb windows is not filled in with 0xff. 157 * Evas works around MESA/intel xorg bug where alpha channel of non-argb windows is not filled in with 0xff.
158 * edje entry: remove duplicated ecore_imf_context_reset in adjusting the selection
158 159
159Fixes: 160Fixes:
160 * Fix a memory leak in ecore_con_dns when using ecore_con_server_connect 161 * 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,
538 free(en->selection); 538 free(en->selection);
539 en->selection = NULL; 539 en->selection = NULL;
540 } 540 }
541
542 _edje_entry_imf_context_reset(en->rp);
541 _edje_emit(ed, "selection,start", en->rp->part->name); 543 _edje_emit(ed, "selection,start", en->rp->part->name);
542} 544}
543 545
@@ -545,7 +547,6 @@ static void
545_sel_extend(Edje *ed, Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) 547_sel_extend(Edje *ed, Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
546{ 548{
547 if (!en->sel_end) return; 549 if (!en->sel_end) return;
548 _edje_entry_imf_context_reset(en->rp);
549 _sel_enable(ed, c, o, en); 550 _sel_enable(ed, c, o, en);
550 if (!evas_textblock_cursor_compare(c, en->sel_end)) return; 551 if (!evas_textblock_cursor_compare(c, en->sel_end)) return;
551 evas_textblock_cursor_copy(c, en->sel_end); 552 evas_textblock_cursor_copy(c, en->sel_end);
@@ -564,7 +565,6 @@ static void
564_sel_preextend(Edje *ed, Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) 565_sel_preextend(Edje *ed, Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
565{ 566{
566 if (!en->sel_end) return; 567 if (!en->sel_end) return;
567 _edje_entry_imf_context_reset(en->rp);
568 _sel_enable(ed, c, o, en); 568 _sel_enable(ed, c, o, en);
569 if (!evas_textblock_cursor_compare(c, en->sel_start)) return; 569 if (!evas_textblock_cursor_compare(c, en->sel_start)) return;
570 evas_textblock_cursor_copy(c, en->sel_start); 570 evas_textblock_cursor_copy(c, en->sel_start);
@@ -2786,8 +2786,6 @@ _edje_entry_select_begin(Edje_Real_Part *rp)
2786 en = rp->typedata.text->entry_data; 2786 en = rp->typedata.text->entry_data;
2787 if (!en) return; 2787 if (!en) return;
2788 2788
2789 _edje_entry_imf_context_reset(rp);
2790
2791 _sel_clear(en->ed, en->cursor, rp->object, en); 2789 _sel_clear(en->ed, en->cursor, rp->object, en);
2792 _sel_enable(en->ed, en->cursor, rp->object, en); 2790 _sel_enable(en->ed, en->cursor, rp->object, en);
2793 _sel_start(en->cursor, rp->object, en); 2791 _sel_start(en->cursor, rp->object, en);
@@ -2805,7 +2803,6 @@ _edje_entry_select_extend(Edje_Real_Part *rp)
2805 (!rp->typedata.text)) return; 2803 (!rp->typedata.text)) return;
2806 en = rp->typedata.text->entry_data; 2804 en = rp->typedata.text->entry_data;
2807 if (!en) return; 2805 if (!en) return;
2808 _edje_entry_imf_context_reset(rp);
2809 _sel_extend(en->ed, en->cursor, rp->object, en); 2806 _sel_extend(en->ed, en->cursor, rp->object, en);
2810 2807
2811 _edje_entry_real_part_configure(en->ed, rp); 2808 _edje_entry_real_part_configure(en->ed, rp);