From b85f66f14ad7f8c9f0e455b3e769b44cadf77b4e Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sun, 22 Jan 2017 09:56:44 +0000 Subject: [PATCH] search: Fix multiple search and bringing offscreen matches in --- src/bin/editor/edi_editor.c | 2 +- src/bin/editor/edi_editor_search.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c index 1301489..fe0ff24 100644 --- a/src/bin/editor/edi_editor.c +++ b/src/bin/editor/edi_editor.c @@ -516,7 +516,7 @@ _smart_cb_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, } else if (!strcmp(ev->key, "f")) { - edi_mainview_search(); + edi_editor_search(editor); } else if (!strcmp(ev->key, "g")) { diff --git a/src/bin/editor/edi_editor_search.c b/src/bin/editor/edi_editor_search.c index def6937..cbf4114 100644 --- a/src/bin/editor/edi_editor_search.c +++ b/src/bin/editor/edi_editor_search.c @@ -61,7 +61,7 @@ _edi_search_in_entry(Evas_Object *entry, Edi_Editor_Search *search) try_next = EINA_TRUE; } - found = 0; + found = ELM_CODE_TEXT_NOT_FOUND; EINA_LIST_FOREACH(code->file->lines, item, line) { if (line->number < pos_line) @@ -86,6 +86,8 @@ _edi_search_in_entry(Evas_Object *entry, Edi_Editor_Search *search) if (!search->term_found) return EINA_FALSE; + elm_code_widget_cursor_position_set(entry, search->current_search_line, + search->current_search_col); elm_code_widget_selection_start(entry, search->current_search_line, search->current_search_col); elm_code_widget_selection_end(entry, search->current_search_line,