asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix caret position and viewport centering after deleting line (Ctrl-X)

Browse source
This commit is contained in:
jmb462 2021-10-02 11:23:36 +02:00
parent 865b62b1cd
commit fcb102a826
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scene/gui/text_edit.cpp
View file

@ -5072,10 +5072,12 @@ void TextEdit::_cut_internal() {
} }
int cl = get_caret_line(); int cl = get_caret_line();
int cc = get_caret_column();
int indent_level = get_indent_level(cl);
double hscroll = get_h_scroll();
String clipboard = text[cl]; String clipboard = text[cl];
DisplayServer::get_singleton()->clipboard_set(clipboard); DisplayServer::get_singleton()->clipboard_set(clipboard);
set_caret_line(cl);
set_caret_column(0); set_caret_column(0);
if (cl == 0 && get_line_count() > 1) { if (cl == 0 && get_line_count() > 1) {
@ -5086,6 +5088,17 @@ void TextEdit::_cut_internal() {
set_caret_line(get_caret_line() + 1); set_caret_line(get_caret_line() + 1);
} }
// Correct the visualy perceived caret column taking care of identation level of the lines.
int diff_indent = indent_level - get_indent_level(get_caret_line());
cc += diff_indent;
if (diff_indent != 0) {
cc += diff_indent > 0 ? -1 : 1;
}
// Restore horizontal scroll and caret column modified by the backspace() call.
set_h_scroll(hscroll);
set_caret_column(cc);
cut_copy_line = clipboard; cut_copy_line = clipboard;
} }