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

Merge pull request #68759 from MewPurPur/bookmark-fix

Browse Source 
Fix text selection persisting on bookmark traversal
This commit is contained in:
Rémi Verschelde 2022-11-28 08:06:05 +01:00
commit d4c4a44607
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
editor/code_editor.cpp
View File

@ -2002,23 +2002,14 @@ void CodeTextEditor::goto_next_bookmark() {
return; return;
} }
text_editor->remove_secondary_carets(); int current_line = text_editor->get_caret_line();
int line = text_editor->get_caret_line(); int bmark_idx = 0;
if (line >= (int)bmarks[bmarks.size() - 1]) { if (current_line < (int)bmarks[bmarks.size() - 1]) {
text_editor->unfold_line(bmarks[0]); while (bmark_idx < bmarks.size() && bmarks[bmark_idx] <= current_line) {
text_editor->set_caret_line(bmarks[0]); bmark_idx++;
text_editor->center_viewport_to_caret();
} else {
for (int i = 0; i < bmarks.size(); i++) {
int bmark_line = bmarks[i];
if (bmark_line > line) {
text_editor->unfold_line(bmark_line);
text_editor->set_caret_line(bmark_line);
text_editor->center_viewport_to_caret();
return;
}
} }
} }
goto_line_centered(bmarks[bmark_idx]);
} }
void CodeTextEditor::goto_prev_bookmark() { void CodeTextEditor::goto_prev_bookmark() {
@ -2027,23 +2018,14 @@ void CodeTextEditor::goto_prev_bookmark() {
return; return;
} }
text_editor->remove_secondary_carets(); int current_line = text_editor->get_caret_line();
int line = text_editor->get_caret_line(); int bmark_idx = bmarks.size() - 1;
if (line <= (int)bmarks[0]) { if (current_line > (int)bmarks[0]) {
text_editor->unfold_line(bmarks[bmarks.size() - 1]); while (bmark_idx >= 0 && bmarks[bmark_idx] >= current_line) {
text_editor->set_caret_line(bmarks[bmarks.size() - 1]); bmark_idx--;
text_editor->center_viewport_to_caret();
} else {
for (int i = bmarks.size() - 1; i >= 0; i--) {
int bmark_line = bmarks[i];
if (bmark_line < line) {
text_editor->unfold_line(bmark_line);
text_editor->set_caret_line(bmark_line);
text_editor->center_viewport_to_caret();
return;
}
} }
} }
goto_line_centered(bmarks[bmark_idx]);
} }
void CodeTextEditor::remove_all_bookmarks() { void CodeTextEditor::remove_all_bookmarks() {