nikawhite pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=17c4e71fc108cb32f8481de6e9a0af0d89a7a906
commit 17c4e71fc108cb32f8481de6e9a0af0d89a7a906
Author: Mykyta Biliavskyi <m.biliavs...@samsung.com>
Date: Mon Sep 14 17:39:47 2015 +0000
Edc_editor: fix compile warning and clear code.
Reveret "Edc_editor: after insert candidate,
move cursor to end of attribute", because it cause
wrong behaviour.
Clear code, make selection in entry by elm_entry_selection_set.
---
src/lib/edc_editor.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index a19c75d..419b950 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -335,7 +335,8 @@ ctxpopup_candidate_dismiss_cb(void *data, Evas_Object *obj,
}
static void
-ctxpopup_candidate_changed_cb(void *data, Evas_Object *obj, void *event_info)
+ctxpopup_candidate_changed_cb(void *data, Evas_Object *obj EINA_UNUSED,
+ void *event_info)
{
edit_data *ed = data;
const char *text = event_info;
@@ -358,15 +359,14 @@ ctxpopup_candidate_changed_cb(void *data, Evas_Object
*obj, void *event_info)
}
}
- elm_entry_cursor_pos_set(ed->en_edit, cur_pos);
- elm_entry_cursor_selection_begin(ed->en_edit);
- elm_entry_cursor_pos_set(ed->en_edit, end_pos);
- elm_entry_cursor_selection_end(ed->en_edit);
+ elm_entry_select_region_set(ed->en_edit, cur_pos, end_pos);
redoundo_text_relative_push(ed->rd, text);
elm_entry_entry_insert(ed->en_edit, text);
elm_entry_calc_force(ed->en_edit);
+ elm_entry_cursor_pos_set(ed->en_edit, cur_pos);
+
edit_changed_set(ed, EINA_TRUE);
evas_object_smart_callback_call(ed->enventor, SIG_CTXPOPUP_CHANGED,
(void *)text);
--
