diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-03 09:30:26 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-03 09:30:26 +0200 |
| commit | d331b803b8e63b0dab406a12c21805a17ee0a6a8 (patch) | |
| tree | 6f8e0c950ce333216955461f26cb405fdcf6feea /scene/main | |
| parent | 4e237ed9efdef41de12eb41971c391f755897c60 (diff) | |
| parent | 2a7e61457a03eb8c82dc5e7aabcbe69a0a1266e0 (diff) | |
Merge pull request #66750 from EricEzaM/62899-allow-shortcut-joypab-btn
Allow shortcut input to be JoypadButton.
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/viewport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 549cc19cb1..05b4f181c2 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -2799,7 +2799,7 @@ void Viewport::push_unhandled_input(const Ref<InputEvent> &p_event, bool p_local } // Shortcut Input. - if (Object::cast_to<InputEventKey>(*ev) != nullptr || Object::cast_to<InputEventShortcut>(*ev) != nullptr) { + if (Object::cast_to<InputEventKey>(*ev) != nullptr || Object::cast_to<InputEventShortcut>(*ev) != nullptr || Object::cast_to<InputEventJoypadButton>(*ev) != nullptr) { get_tree()->_call_input_pause(shortcut_input_group, SceneTree::CALL_INPUT_TYPE_SHORTCUT_INPUT, ev, this); } |