From 26c5bac428c5190ca8d2f44180e5c248fc5e66c9 Mon Sep 17 00:00:00 2001 From: Emmanuel Barroga Date: Mon, 12 Aug 2019 03:39:27 -0700 Subject: [PATCH] Fix Right-Click Menu Deselecting Edits Content Right-clicking a property to open the context menu deselects the text field. This causes the context menu to be useless because it doesn't have anything to edit. --- editor/editor_spin_slider.cpp | 5 +++++ scene/gui/spin_box.cpp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/editor/editor_spin_slider.cpp b/editor/editor_spin_slider.cpp index 99663940255..379b8a2980b 100644 --- a/editor/editor_spin_slider.cpp +++ b/editor/editor_spin_slider.cpp @@ -347,6 +347,11 @@ void EditorSpinSlider::_value_input_closed() { //focus_exited signal void EditorSpinSlider::_value_focus_exited() { + + // discontinue because the focus_exit was caused by right-click context menu + if (value_input->get_menu()->is_visible()) + return; + _evaluate_input_text(); // focus is not on the same element after the vlalue_input was exited // -> focus is on next element diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp index db277d3705f..6ada0cba97a 100644 --- a/scene/gui/spin_box.cpp +++ b/scene/gui/spin_box.cpp @@ -170,6 +170,10 @@ void SpinBox::_gui_input(const Ref &p_event) { void SpinBox::_line_edit_focus_exit() { + // discontinue because the focus_exit was caused by right-click context menu + if (line_edit->get_menu()->is_visible()) + return; + _text_entered(line_edit->get_text()); }