summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-11-28 09:04:25 +0100
committerGitHub <noreply@github.com>2020-11-28 09:04:25 +0100
commita09846e01542f199bbc7eb8b85003736a57f3e16 (patch)
treedcb2a7c189a7f65095cb1fef9f59eee45b072360 /modules
parenta6751e6c58e73d6b8d04e98bba5fb6e380fdf34f (diff)
parent7941235e06c8acf1cb2888de3db8905c60c8ff00 (diff)
Merge pull request #42109 from EricEzaM/PR/input-and-shortcuts-rework
Shortcuts rework - fixed issues with input propagation and triggering of unwanted shortcuts.
Diffstat (limited to 'modules')
-rw-r--r--modules/visual_script/visual_script_editor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp
index 90c3f4e6b4..64abd3dd84 100644
--- a/modules/visual_script/visual_script_editor.cpp
+++ b/modules/visual_script/visual_script_editor.cpp
@@ -4729,6 +4729,7 @@ VisualScriptEditor::VisualScriptEditor() {
saved_position = Vector2(0, 0);
edit_menu = memnew(MenuButton);
+ edit_menu->set_shortcut_context(this);
edit_menu->set_text(TTR("Edit"));
edit_menu->set_switch_on_hover(true);
edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("visual_script_editor/delete_selected"), EDIT_DELETE_NODES);
@@ -4930,7 +4931,6 @@ VisualScriptEditor::VisualScriptEditor() {
updating_members = false;
set_process_input(true);
- set_process_unhandled_input(true);
default_value_edit = memnew(CustomPropertyEditor);
add_child(default_value_edit);