godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9002 from Hinsbart/key_action_match

Browse Source 
InputEvent: Restore old behaviour for matching key events to actions.
This commit is contained in:
Rémi Verschelde 2017-06-08 07:43:18 +02:00 committed by GitHub
commit b52466f793
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/os/input_event.cpp
View File

@ -282,7 +282,10 @@ bool InputEventKey::action_match(const Ref<InputEvent> &p_event) const {
if (key.is_null())
return false;
return get_scancode_with_modifiers() == key->get_scancode_with_modifiers();
uint32_t code = get_scancode_with_modifiers();
uint32_t event_code = key->get_scancode_with_modifiers();
return get_scancode() == key->get_scancode() && (!key->is_pressed() || (code & event_code) == code);
}
void InputEventKey::_bind_methods() {