Browse Source

Added accept_event() calls for SceneTreeDock and BaseButton

Eric M 5 years ago
parent
commit
9d7d20a978
2 changed files with 6 additions and 0 deletions
  1. 5 0
      editor/scene_tree_dock.cpp
  2. 1 0
      scene/gui/base_button.cpp

+ 5 - 0
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) {

+ 1 - 0
scene/gui/base_button.cpp

@@ -327,6 +327,7 @@ Ref<Shortcut> BaseButton::get_shortcut() const {
 void BaseButton::_unhandled_input(Ref<InputEvent> p_event) {
 	if (!is_disabled() && is_visible_in_tree() && !p_event->is_echo() && shortcut.is_valid() && shortcut->is_shortcut(p_event)) {
 		on_action_event(p_event);
+		accept_event();
 	}
 }