godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consistant scroll when using members overview, issue 11648

Browse Source
This commit is contained in:
Paulb23 2017-10-08 14:29:27 +01:00
parent bd10a00240
commit b07dfd75ea
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/plugins/script_editor_plugin.cpp
View File

@ -1278,7 +1278,11 @@ void ScriptEditor::_members_overview_selected(int p_idx) {
if (!se) { if (!se) {
return; return;
} }
se->goto_line(members_overview->get_item_metadata(p_idx)); Dictionary state;
state["scroll_position"] = members_overview->get_item_metadata(p_idx);
state["column"] = 0;
state["row"] = members_overview->get_item_metadata(p_idx);
se->set_edit_state(state);
se->ensure_focus(); se->ensure_focus();
} }

2
editor/plugins/script_text_editor.cpp
View File

@ -529,9 +529,9 @@ void ScriptTextEditor::ensure_focus() {
void ScriptTextEditor::set_edit_state(const Variant &p_state) { void ScriptTextEditor::set_edit_state(const Variant &p_state) {
Dictionary state = p_state; Dictionary state = p_state;
code_editor->get_text_edit()->set_v_scroll(state["scroll_position"]);
code_editor->get_text_edit()->cursor_set_column(state["column"]); code_editor->get_text_edit()->cursor_set_column(state["column"]);
code_editor->get_text_edit()->cursor_set_line(state["row"]); 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(); code_editor->get_text_edit()->grab_focus();
//int scroll_pos; //int scroll_pos;

8
scene/gui/text_edit.cpp
View File

@ -4287,6 +4287,14 @@ int TextEdit::get_v_scroll() const {
} }
void TextEdit::set_v_scroll(int p_scroll) { void TextEdit::set_v_scroll(int p_scroll) {
if (p_scroll < 0) {
p_scroll = 0;
}
if (!scroll_past_end_of_file_enabled) {
if (p_scroll + get_visible_rows() > get_line_count()) {
p_scroll = get_line_count() - get_visible_rows();
}
}
v_scroll->set_value(p_scroll); v_scroll->set_value(p_scroll);
cursor.line_ofs = p_scroll; cursor.line_ofs = p_scroll;
} }