vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm_code: update parameter order

This commit is contained in:
Andy Williams 2016-12-12 08:30:59 +00:00
parent efd56cf918
commit 3f76c4d290
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/editor/edi_editor.c
View File

@ -75,7 +75,7 @@ _edi_editor_current_word_get(Edi_Editor *editor)
char *ptr, *curword, *curtext; char *ptr, *curword, *curtext;
unsigned int curlen, col, row, wordlen; 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); code = elm_code_widget_code_get(editor->entry);
line = elm_code_file_line_get(code->file, row); 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"); 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); code = elm_code_widget_code_get(editor->entry);
line = elm_code_file_line_get(code->file, row); 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, elm_code_line_text_insert(line, col - wordlen - 1,
list_word, strlen(list_word)); list_word, strlen(list_word));
elm_code_widget_cursor_position_set(editor->entry, elm_code_widget_cursor_position_set(editor->entry, row,
col - wordlen + strlen(list_word), row); col - wordlen + strlen(list_word));
} }
evas_object_del(_clang_autocomplete_popup_bg); evas_object_del(_clang_autocomplete_popup_bg);
@ -209,7 +209,7 @@ _autocomplete_list_update(Evas_Object *genlist, Edi_Editor *editor)
const char *path, *args; const char *path, *args;
unsigned int clang_argc, row, col; 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); code = elm_code_widget_code_get(editor->entry);
path = elm_code_file_path_get(code->file); path = elm_code_file_path_get(code->file);
@ -277,7 +277,7 @@ _clang_autocomplete_popup(Edi_Editor *editor)
unsigned int col, row; unsigned int col, row;
Evas_Coord cx, cy, cw, ch; 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, elm_code_widget_geometry_for_position_get(editor->entry, row, col,
&cx, &cy, &cw, &ch); &cx, &cy, &cw, &ch);
edi_editor_save(editor); 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; unsigned int col;
widget = (Elm_Code_Widget *)obj; 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); snprintf(buf, sizeof(buf), "Line:%d, Column:%d", line, col);
elm_object_text_set((Evas_Object *)data, buf); elm_object_text_set((Evas_Object *)data, buf);

2
src/bin/editor/edi_editor_search.c
View File

@ -54,7 +54,7 @@ _edi_search_in_entry(Evas_Object *entry, Edi_Editor_Search *search)
} }
code = elm_code_widget_code_get(entry); 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 && if (search->current_search_line == pos_line &&
search->current_search_col == pos_col) search->current_search_col == pos_col)
{ {

2
src/bin/mainview/edi_mainview.c
View File

@ -616,7 +616,7 @@ edi_mainview_goto(int line)
if (!editor || line <= 0) if (!editor || line <= 0)
return; 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); elm_object_focus_set(editor->entry, EINA_TRUE);
} }