Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-23 04:16:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit 8cefbfcf432ef6ed3879ee60bf500b52149f3e01)
This commit is contained in:
Haoyu Qiu 2022-04-05 09:12:10 +08:00 committed by Relintai
parent 983eec5521
commit 2aefcf5585
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

@ -6457,9 +6457,6 @@ void TextEdit::undo() {
TextOperation op = undo_stack_pos->get(); TextOperation op = undo_stack_pos->get();
_do_text_op(op, true); _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; current_op.version = op.prev_version;
if (undo_stack_pos->get().chain_backward) { if (undo_stack_pos->get().chain_backward) {
@ -6475,6 +6472,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(); _update_scrollbars();
if (undo_stack_pos->get().type == TextOperation::TYPE_REMOVE) { if (undo_stack_pos->get().type == TextOperation::TYPE_REMOVE) {
cursor_set_line(undo_stack_pos->get().to_line, false); cursor_set_line(undo_stack_pos->get().to_line, false);