maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #14613 from voithos/fold-jump-bugfix

Browse source 
Account for folded code blocks when navigating via members list
This commit is contained in:
Rémi Verschelde 2017-12-16 01:16:25 +01:00 committed by GitHub
parent 2e21a427ee f139d0e4e6
commit 03fb1fd7fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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() {