summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorEric M <itsjusteza@gmail.com>2020-09-16 10:44:38 +1000
committerEric M <itsjusteza@gmail.com>2020-11-23 21:14:25 +1000
commit9d7d20a978fccf7b2871dc388f16b87b4b686144 (patch)
tree0bb7805890d604486a86e3fe2f42ec55f705bc21 /editor
parent18023cc3ede6fd84842db77019085c383e807016 (diff)
Added accept_event() calls for SceneTreeDock and BaseButton
Diffstat (limited to 'editor')
-rw-r--r--editor/scene_tree_dock.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index ec225c3c38..83e16a2dd2 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -114,7 +114,12 @@ void SceneTreeDock::_unhandled_key_input(Ref<InputEvent> p_event) {
_tool_selected(TOOL_COPY_NODE_PATH);
} else if (ED_IS_SHORTCUT("scene_tree/delete", p_event)) {
_tool_selected(TOOL_ERASE);
+ } else {
+ return;
}
+
+ // Tool selection was successful, accept the event to stop propagation.
+ accept_event();
}
void SceneTreeDock::instance(const String &p_file) {