Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #116585 from jinyangcruise/fix_symbol_jump

Browse source 
Fix symbol jump history navigation issue.
This commit is contained in:
Thaddeus Crews 2026-03-04 11:20:33 -06:00
commit db25be3646
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
13 changed files with 183 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

14
editor/script/script_text_editor.cpp
View file

@ -1161,11 +1161,18 @@ void ScriptTextEditor::_on_caret_moved() {
if (code_editor->is_previewing_navigation_change()) {
return;
}
if (is_layout_pending_in_tree()) {
call_on_all_layout_pending_finished(callable_mp(this, &ScriptTextEditor::_on_caret_moved));
return;
}
// When previous_line < 0, it means the user has just switched to this editor from a different one
// (which already saved a state in the history). In this case, we should not save this editor's previous state.
int current_line = code_editor->get_text_editor()->get_caret_line();
if (Math::abs(current_line - previous_line) >= 10) {
if (previous_line >= 0 && Math::abs(current_line - previous_line) >= 10) {
Dictionary nav_state = get_navigation_state();
nav_state["row"] = previous_line;
nav_state["scroll_position"] = -1;
nav_state["ensure_caret_visible"] = true;
emit_signal(SNAME("request_save_previous_state"), nav_state);
store_previous_state();
}
@ -1888,6 +1895,11 @@ void ScriptTextEditor::_notification(int p_what) {
case NOTIFICATION_DRAG_END: {
drag_info_label->hide();
} break;
case NOTIFICATION_VISIBILITY_CHANGED: {
if (!is_visible()) {
previous_line = -1;
}
} break;
}
}