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

Merge pull request #67491 from Paulb23/fix-undo-redo-viewport-adjust

Browse source 
Fix undo redo not adjusting TextEdit viewport to caret
This commit is contained in:
Rémi Verschelde 2022-10-17 17:31:26 +02:00
commit ebca8b8aea
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/gui/text_edit.cpp
View file

@ -3863,7 +3863,7 @@ void TextEdit::undo() {
}
caret_pos_dirty = true;
}
queue_redraw();
adjust_viewport_to_caret();
}
void TextEdit::redo() {
@ -3915,7 +3915,7 @@ void TextEdit::redo() {
}
caret_pos_dirty = true;
}
queue_redraw();
adjust_viewport_to_caret();
}
void TextEdit::clear_undo_history() {

26
tests/scene/test_text_edit.h
View file

@ -3918,6 +3918,32 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
CHECK(text_edit->get_last_full_visible_line_wrap_index() == 0);
CHECK(text_edit->get_caret_wrap_index() == 0);
// Typing and undo / redo should adjust viewport
text_edit->set_caret_line(0);
text_edit->set_caret_column(0);
text_edit->set_line_as_first_visible(5);
MessageQueue::get_singleton()->flush();
CHECK(text_edit->get_first_visible_line() == 5);
SEND_GUI_KEY_EVENT(text_edit, Key::A);
CHECK(text_edit->get_first_visible_line() == 0);
text_edit->set_line_as_first_visible(5);
MessageQueue::get_singleton()->flush();
CHECK(text_edit->get_first_visible_line() == 5);
text_edit->undo();
MessageQueue::get_singleton()->flush();
CHECK(text_edit->get_first_visible_line() == 0);
text_edit->set_line_as_first_visible(5);
MessageQueue::get_singleton()->flush();
CHECK(text_edit->get_first_visible_line() == 5);
text_edit->redo();
MessageQueue::get_singleton()->flush();
CHECK(text_edit->get_first_visible_line() == 0);
memdelete(text_edit);
}