godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12542 from Paulb23/enter_remove_text_issue_12494 

Remove text on enter, issue 12494
This commit is contained in:
Rémi Verschelde 2017-10-31 23:37:30 +01:00 committed by GitHub
parent 63adc9f113 e03a054714
commit 29ea79e065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/gui/text_edit.cpp
View File

@ -2188,7 +2188,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
} }
} }
} }
begin_complex_operation();
bool first_line = false; bool first_line = false;
if (k->get_command()) { if (k->get_command()) {
if (k->get_shift()) { if (k->get_shift()) {
@ -2204,8 +2204,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
} }
} }
_insert_text_at_cursor(ins); insert_text_at_cursor(ins);
_push_current_op();
if (first_line) { if (first_line) {
cursor_set_line(0); 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_line(cursor.line - 1);
cursor_set_column(text[cursor.line].length()); cursor_set_column(text[cursor.line].length());
} }
end_complex_operation();
} break; } break;
case KEY_ESCAPE: { case KEY_ESCAPE: {
if (completion_hint != "") { if (completion_hint != "") {