diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-10-31 23:37:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 23:37:30 +0100 |
| commit | 29ea79e065cb1ecffec6b8ad17d9996f21abf1cb (patch) | |
| tree | 839519997ad4f5b09426902f583877a7d8fd5b4a /scene | |
| parent | 63adc9f113e62d9afc321d8ffa28d5ecc9b51029 (diff) | |
| parent | e03a054714a6562f1094ed322a761e23d0b05219 (diff) | |
Merge pull request #12542 from Paulb23/enter_remove_text_issue_12494
Remove text on enter, issue 12494
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/text_edit.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 2d55c077f1..ee7762b668 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -2188,7 +2188,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } } } - + begin_complex_operation(); bool first_line = false; if (k->get_command()) { if (k->get_shift()) { @@ -2204,8 +2204,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } } - _insert_text_at_cursor(ins); - _push_current_op(); + insert_text_at_cursor(ins); if (first_line) { cursor_set_line(0); @@ -2213,7 +2212,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { cursor_set_line(cursor.line - 1); cursor_set_column(text[cursor.line].length()); } - + end_complex_operation(); } break; case KEY_ESCAPE: { if (completion_hint != "") { |