Merge pull request #20511 from maksloboda/InputEventActionFix

Fixed shortcuts not working with InputEventActions
2018-07-28 09:48:44 +02:00
parent 66429a1576 c2be1a75a0
commit e6aec27428
2 changed files with 9 additions and 0 deletions
--- a/core/os/input_event.cpp
+++ b/core/os/input_event.cpp
@ -949,6 +949,14 @@ bool InputEventAction::is_pressed() const {
 	return pressed;
 }

+bool InputEventAction::shortcut_match(const Ref<InputEvent> &p_event) const {
+	Ref<InputEventKey> event = p_event;
+	if (event.is_null())
+		return false;
+
+	return event->is_action(action);
+}
+
 bool InputEventAction::is_action(const StringName &p_action) const {

 	return action == p_action;