Merge pull request #81128 from KoBeWi/devourer_of_input_meets_destroy…

…er_of_focus Unfocus LineEdit when pressing Escape
godotengine · Aug 30, 2023 · f7c48cf · f7c48cf
2 parents d222194 + e21c30e
commit f7c48cf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
@@ -482,6 +482,11 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 			return;
 		}
 
+		if (k->is_action("ui_cancel")) {
+			release_focus();
+			return;
+		}
+
 		if (is_shortcut_keys_enabled()) {
 			if (k->is_action("ui_copy", true)) {
 				copy_text();

diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp
@@ -210,6 +210,11 @@ void SpinBox::_line_edit_focus_exit() {
 	if (line_edit->is_menu_visible()) {
 		return;
 	}
+	// Discontinue because the focus_exit was caused by canceling.
+	if (Input::get_singleton()->is_action_pressed("ui_cancel")) {
+		_update_text();
+		return;
+	}
 
 	_text_submitted(line_edit->get_text());
 }