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

Merge pull request #43451 from timothyqiu/move-line-cursor 

Keep cursor relative position after move lines up/down in text editor
This commit is contained in:
Rémi Verschelde 2020-11-11 22:32:17 +01:00 committed by GitHub
parent 2a0debd077 87fb2bde0c
commit 8344d27276
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/code_editor.cpp
View File

@ -1138,6 +1138,7 @@ void CodeTextEditor::move_lines_up() {
int from_col = text_editor->get_selection_from_column(); int from_col = text_editor->get_selection_from_column();
int to_line = text_editor->get_selection_to_line(); int to_line = text_editor->get_selection_to_line();
int to_column = text_editor->get_selection_to_column(); int to_column = text_editor->get_selection_to_column();
int cursor_line = text_editor->cursor_get_line();
for (int i = from_line; i <= to_line; i++) { for (int i = from_line; i <= to_line; i++) {
int line_id = i; int line_id = i;
@ -1155,7 +1156,9 @@ void CodeTextEditor::move_lines_up() {
} }
int from_line_up = from_line > 0 ? from_line - 1 : from_line; int from_line_up = from_line > 0 ? from_line - 1 : from_line;
int to_line_up = to_line > 0 ? to_line - 1 : to_line; int to_line_up = to_line > 0 ? to_line - 1 : to_line;
int cursor_line_up = cursor_line > 0 ? cursor_line - 1 : cursor_line;
text_editor->select(from_line_up, from_col, to_line_up, to_column); text_editor->select(from_line_up, from_col, to_line_up, to_column);
text_editor->cursor_set_line(cursor_line_up);
} else { } else {
int line_id = text_editor->cursor_get_line(); int line_id = text_editor->cursor_get_line();
int next_id = line_id - 1; int next_id = line_id - 1;
@ -1181,6 +1184,7 @@ void CodeTextEditor::move_lines_down() {
int from_col = text_editor->get_selection_from_column(); int from_col = text_editor->get_selection_from_column();
int to_line = text_editor->get_selection_to_line(); int to_line = text_editor->get_selection_to_line();
int to_column = text_editor->get_selection_to_column(); int to_column = text_editor->get_selection_to_column();
int cursor_line = text_editor->cursor_get_line();
for (int i = to_line; i >= from_line; i--) { for (int i = to_line; i >= from_line; i--) {
int line_id = i; int line_id = i;
@ -1198,7 +1202,9 @@ void CodeTextEditor::move_lines_down() {
} }
int from_line_down = from_line < text_editor->get_line_count() ? from_line + 1 : from_line; int from_line_down = from_line < text_editor->get_line_count() ? from_line + 1 : from_line;
int to_line_down = to_line < text_editor->get_line_count() ? to_line + 1 : to_line; int to_line_down = to_line < text_editor->get_line_count() ? to_line + 1 : to_line;
int cursor_line_down = cursor_line < text_editor->get_line_count() ? cursor_line + 1 : cursor_line;
text_editor->select(from_line_down, from_col, to_line_down, to_column); text_editor->select(from_line_down, from_col, to_line_down, to_column);
text_editor->cursor_set_line(cursor_line_down);
} else { } else {
int line_id = text_editor->cursor_get_line(); int line_id = text_editor->cursor_get_line();
int next_id = line_id + 1; int next_id = line_id + 1;