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

console: Jump to column on click when available in errors

This commit is contained in:
Andy Williams 2017-06-09 10:36:52 -07:00
parent 19c62faa48
commit 208dc9ed2f
2 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,7 +324,12 @@ _edi_mainview_item_tab_add(Edi_Path_Options *options, const char *mime)
elm_object_focus_set(editor->entry, EINA_TRUE);
if (options->line)
edi_mainview_goto(options->line);
{
if (options->character > 1)
edi_mainview_goto_position(options->line, options->character);
else
edi_mainview_goto(options->line);
}
_edi_project_config_tab_add(options->path, options->type, EINA_FALSE);
}
@ -482,7 +487,12 @@ edi_mainview_open(Edi_Path_Options *options)
{
edi_mainview_item_select(it);
if (options->line)
edi_mainview_goto(options->line);
{
if (options->character > 1)
edi_mainview_goto_position(options->line, options->character);
else
edi_mainview_goto(options->line);
}
return;
}
@ -735,23 +745,21 @@ edi_mainview_search()
}
void
edi_mainview_goto(int number)
edi_mainview_goto(unsigned int number)
{
edi_mainview_goto_position(number, 1);
}
void
edi_mainview_goto_position(unsigned int row, unsigned int col)
{
Edi_Editor *editor;
Elm_Code *code;
Elm_Code_Line *line;
editor = (Edi_Editor *)evas_object_data_get(_current_view, "editor");
if (!editor || number <= 0)
if (!editor || row <= 0 || col <= 0)
return;
code = elm_code_widget_code_get(editor->entry);
line = elm_code_file_line_get(code->file, number);
if (!line)
return;
elm_code_widget_cursor_position_set(editor->entry, number, 1);
elm_code_widget_cursor_position_set(editor->entry, row, col);
elm_object_focus_set(editor->entry, EINA_TRUE);
}

12
src/bin/mainview/edi_mainview.h
View File

@ -210,7 +210,17 @@ void edi_mainview_search();
*
* @ingroup Content
*/
void edi_mainview_goto(int line);
void edi_mainview_goto(unsigned int line);
/**
* Go to a requested line, column position in the current view's contents.
*
* @param row the line number (1 based) to scroll to
* @param col the column position (1 based) to scroll to
*
* @ingroup Content
*/
void edi_mainview_goto_position(unsigned int row, unsigned int col);
/**
* Present a popup that will initiate a goto in the current view.