asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Account for folded code blocks when navigating via members list

Browse source 
Previously, the editor would attempt to set the scroll position to the
function's line number, but this would result in an invalid scroll
whenever functions above the target were folded.

This changes callback to use a combination of `goto_line` and
`set_edit_state` to navigate to the target line and reset the cursor to
column 0.

Using `goto_line` also has the side effect of automatically unfolding
the target function, which seems like useful behavior.

Fixes #14572.
This commit is contained in:
Zaven Muradyan 2017-12-12 21:40:12 -08:00
parent fb12d700c9
commit f139d0e4e6
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editor/plugins/script_editor_plugin.cpp
View file

@ -1329,12 +1329,12 @@ void ScriptEditor::_members_overview_selected(int p_idx) {
if (!se) {
return;
}
Dictionary state;
state["scroll_position"] = members_overview->get_item_metadata(p_idx);
// Go to the member's line and reset the cursor column. We can't just change scroll_position
// directly, since code might be folded.
se->goto_line(members_overview->get_item_metadata(p_idx));
Dictionary state = se->get_edit_state();
state["column"] = 0;
state["row"] = members_overview->get_item_metadata(p_idx);
se->set_edit_state(state);
se->ensure_focus();
}
void ScriptEditor::_help_overview_selected(int p_idx) {

4
editor/plugins/script_text_editor.cpp
View file

@ -537,10 +537,6 @@ void ScriptTextEditor::set_edit_state(const Variant &p_state) {
code_editor->get_text_edit()->cursor_set_line(state["row"]);
code_editor->get_text_edit()->set_v_scroll(state["scroll_position"]);
code_editor->get_text_edit()->grab_focus();
//int scroll_pos;
//int cursor_column;
//int cursor_row;
}
String ScriptTextEditor::get_name() {