mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed shortcuts not working with InputEventActions

Browse Source
This commit is contained in:
Max 2018-07-27 14:02:30 +03:00
parent 25f1833890
commit c2be1a75a0
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/os/input_event.cpp
View File

@ -937,6 +937,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;

1
core/os/input_event.h
View File

@ -467,6 +467,7 @@ public:
virtual bool is_action(const StringName &p_action) const;
virtual bool shortcut_match(const Ref<InputEvent> &p_event) const;
virtual bool is_action_type() const { return true; }
virtual String as_text() const;