瀏覽代碼

Fix undo redo not adjusting TextEdit viewport to caret

Paulb23 2 年之前
父節點
當前提交
4bfb1d953c
共有 2 個文件被更改,包括 28 次插入2 次删除
  1. 2 2
      scene/gui/text_edit.cpp
  2. 26 0
      tests/scene/test_text_edit.h

+ 2 - 2
scene/gui/text_edit.cpp

@@ -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 - 0
tests/scene/test_text_edit.h

@@ -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);
 }