summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Barroga <emmanuelbarroga@gmail.com>2019-08-12 03:39:27 -0700
committerEmmanuel Barroga <emmanuelbarroga@gmail.com>2019-08-12 03:39:27 -0700
commit26c5bac428c5190ca8d2f44180e5c248fc5e66c9 (patch)
tree1288167ef712860884d005f405d99a6d3e3a9aef
parent0e823cffbc5e03805e6850bc41e168b0bdecf24e (diff)
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.
-rw-r--r--editor/editor_spin_slider.cpp5
-rw-r--r--scene/gui/spin_box.cpp4
2 files changed, 9 insertions, 0 deletions
diff --git a/editor/editor_spin_slider.cpp b/editor/editor_spin_slider.cpp
index 9966394025..379b8a2980 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 db277d3705..6ada0cba97 100644
--- a/scene/gui/spin_box.cpp
+++ b/scene/gui/spin_box.cpp
@@ -170,6 +170,10 @@ void SpinBox::_gui_input(const Ref<InputEvent> &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());
}