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

Consider chained operation when selecting text in TextEdit::undo()

Browse source 
(cherry picked from commit 8cefbfcf43)
This commit is contained in:
Haoyu Qiu 2022-04-05 09:12:10 +08:00 committed by Rémi Verschelde
parent 6ca73386d1
commit 1d476d7737
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene/gui/text_edit.cpp
View file

@ -6474,9 +6474,6 @@ void TextEdit::undo() {
TextOperation op = undo_stack_pos->get();
_do_text_op(op, true);
if (op.type != TextOperation::TYPE_INSERT && (op.from_line != op.to_line || op.to_column != op.from_column + 1)) {
select(op.from_line, op.from_column, op.to_line, op.to_column);
}
current_op.version = op.prev_version;
if (undo_stack_pos->get().chain_backward) {
@ -6492,6 +6489,10 @@ void TextEdit::undo() {
}
}
if (op.type != TextOperation::TYPE_INSERT && (op.from_line != op.to_line || op.to_column != op.from_column + 1)) {
select(op.from_line, op.from_column, op.to_line, op.to_column);
}
_update_scrollbars();
if (undo_stack_pos->get().type == TextOperation::TYPE_REMOVE) {
cursor_set_line(undo_stack_pos->get().to_line, false);