ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=3f76c4d29045bcb2350c223797b93d19c33bc1b6
commit 3f76c4d29045bcb2350c223797b93d19c33bc1b6
Author: Andy Williams <a...@andywilliams.me>
Date: Mon Dec 12 08:30:59 2016 +0000
elm_code: update parameter order
---
src/bin/editor/edi_editor.c | 14 +++++++-------
src/bin/editor/edi_editor_search.c | 2 +-
src/bin/mainview/edi_mainview.c | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index aaf6b52..6282b17 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -75,7 +75,7 @@ _edi_editor_current_word_get(Edi_Editor *editor)
char *ptr, *curword, *curtext;
unsigned int curlen, col, row, wordlen;
- elm_obj_code_widget_cursor_position_get(editor->entry, &col, &row);
+ elm_obj_code_widget_cursor_position_get(editor->entry, &row, &col);
code = elm_code_widget_code_get(editor->entry);
line = elm_code_file_line_get(code->file, row);
@@ -118,7 +118,7 @@ _autocomplete_list_cb_key_down(void *data EINA_UNUSED, Evas
*e EINA_UNUSED,
editor = (Edi_Editor *)evas_object_data_get(item->view, "editor");
- elm_code_widget_cursor_position_get(editor->entry, &col, &row);
+ elm_code_widget_cursor_position_get(editor->entry, &row, &col);
code = elm_code_widget_code_get(editor->entry);
line = elm_code_file_line_get(code->file, row);
@@ -139,8 +139,8 @@ _autocomplete_list_cb_key_down(void *data EINA_UNUSED, Evas
*e EINA_UNUSED,
elm_code_line_text_insert(line, col - wordlen - 1,
list_word, strlen(list_word));
- elm_code_widget_cursor_position_set(editor->entry,
- col - wordlen + strlen(list_word), row);
+ elm_code_widget_cursor_position_set(editor->entry, row,
+ col - wordlen + strlen(list_word));
}
evas_object_del(_clang_autocomplete_popup_bg);
@@ -209,7 +209,7 @@ _autocomplete_list_update(Evas_Object *genlist, Edi_Editor
*editor)
const char *path, *args;
unsigned int clang_argc, row, col;
- elm_obj_code_widget_cursor_position_get(editor->entry, &col, &row);
+ elm_obj_code_widget_cursor_position_get(editor->entry, &row, &col);
code = elm_code_widget_code_get(editor->entry);
path = elm_code_file_path_get(code->file);
@@ -277,7 +277,7 @@ _clang_autocomplete_popup(Edi_Editor *editor)
unsigned int col, row;
Evas_Coord cx, cy, cw, ch;
- elm_obj_code_widget_cursor_position_get(editor->entry, &col, &row);
+ elm_obj_code_widget_cursor_position_get(editor->entry, &row, &col);
elm_code_widget_geometry_for_position_get(editor->entry, row, col,
&cx, &cy, &cw, &ch);
edi_editor_save(editor);
@@ -372,7 +372,7 @@ _edit_cursor_moved(void *data EINA_UNUSED, Evas_Object
*obj, void *event_info EI
unsigned int col;
widget = (Elm_Code_Widget *)obj;
- elm_code_widget_cursor_position_get(widget, &col, &line);
+ elm_code_widget_cursor_position_get(widget, &line, &col);
snprintf(buf, sizeof(buf), "Line:%d, Column:%d", line, col);
elm_object_text_set((Evas_Object *)data, buf);
diff --git a/src/bin/editor/edi_editor_search.c
b/src/bin/editor/edi_editor_search.c
index 8bb0c62..def6937 100644
--- a/src/bin/editor/edi_editor_search.c
+++ b/src/bin/editor/edi_editor_search.c
@@ -54,7 +54,7 @@ _edi_search_in_entry(Evas_Object *entry, Edi_Editor_Search
*search)
}
code = elm_code_widget_code_get(entry);
- elm_code_widget_cursor_position_get(entry, &pos_col, &pos_line);
+ elm_code_widget_cursor_position_get(entry, &pos_line, &pos_col);
if (search->current_search_line == pos_line &&
search->current_search_col == pos_col)
{
diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c
index 4964cce..c35844c 100644
--- a/src/bin/mainview/edi_mainview.c
+++ b/src/bin/mainview/edi_mainview.c
@@ -616,7 +616,7 @@ edi_mainview_goto(int line)
if (!editor || line <= 0)
return;
- elm_code_widget_cursor_position_set(editor->entry, 1, line);
+ elm_code_widget_cursor_position_set(editor->entry, line, 1);
elm_object_focus_set(editor->entry, EINA_TRUE);
}
--
