diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2019-05-20 22:00:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-20 22:00:39 +0200 |
commit | fdea3d48b041cff23013e7a424e57c814ddd4dbd (patch) | |
tree | 24ee3e3e0123d0424a275890263e832bba2beb75 /scene/gui | |
parent | d400a7bdddf9b0b755ecc8bda3d79f4c709093d5 (diff) | |
parent | 3bc0445e05e633c8336851363d3a09f02771b79c (diff) |
Merge pull request #26809 from KoBeWi/undo_set_text_like_a_boss
Allow to undo TextEdit.set_text
Diffstat (limited to 'scene/gui')
-rw-r--r-- | scene/gui/text_edit.cpp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 8acd28a2f4..8c65935944 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -4303,17 +4303,22 @@ Control::CursorShape TextEdit::get_cursor_shape(const Point2 &p_pos) const { void TextEdit::set_text(String p_text) { setting_text = true; - _clear(); - _insert_text_at_cursor(p_text); - clear_undo_history(); - cursor.column = 0; - cursor.line = 0; - cursor.x_ofs = 0; - cursor.line_ofs = 0; - cursor.wrap_ofs = 0; - cursor.last_fit_x = 0; - cursor_set_line(0); - cursor_set_column(0); + if (!undo_enabled) { + _clear(); + _insert_text_at_cursor(p_text); + } + + if (undo_enabled) { + cursor_set_line(0); + cursor_set_column(0); + + begin_complex_operation(); + _remove_text(0, 0, MAX(0, get_line_count() - 1), MAX(get_line(MAX(get_line_count() - 1, 0)).size() - 1, 0)); + _insert_text_at_cursor(p_text); + end_complex_operation(); + selection.active = false; + } + update(); setting_text = false; |