summaryrefslogtreecommitdiffstats
path: root/editor/inspector_dock.cpp
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 /editor/inspector_dock.cpp
parenta6751e6c58e73d6b8d04e98bba5fb6e380fdf34f (diff)
parent7941235e06c8acf1cb2888de3db8905c60c8ff00 (diff)
downloadredot-engine-a09846e01542f199bbc7eb8b85003736a57f3e16.tar.gz
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 'editor/inspector_dock.cpp')
-rw-r--r--editor/inspector_dock.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp
index 75f89fbfb5..e0ba50fe4f 100644
--- a/editor/inspector_dock.cpp
+++ b/editor/inspector_dock.cpp
@@ -569,6 +569,7 @@ InspectorDock::InspectorDock(EditorNode *p_editor, EditorData &p_editor_data) {
node_info_hb->add_child(editor_path);
object_menu = memnew(MenuButton);
+ object_menu->set_shortcut_context(this);
object_menu->set_icon(get_theme_icon("Tools", "EditorIcons"));
node_info_hb->add_child(object_menu);
object_menu->set_tooltip(TTR("Object properties."));