diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2024-02-07 21:33:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-07 21:33:39 +0100 |
commit | 159dec01ee02b156d5733b542aedc8a4f01b4602 (patch) | |
tree | 19f50fef4d03fa79eb3c069d6308ad4795914c92 /src/yuzu/configuration/configure_hotkeys.h | |
parent | Merge pull request #12912 from FearlessTobi/ports-feb-24 (diff) | |
parent | yuzu: Make controller keys easier to assign (diff) | |
download | yuzu-159dec01ee02b156d5733b542aedc8a4f01b4602.tar yuzu-159dec01ee02b156d5733b542aedc8a4f01b4602.tar.gz yuzu-159dec01ee02b156d5733b542aedc8a4f01b4602.tar.bz2 yuzu-159dec01ee02b156d5733b542aedc8a4f01b4602.tar.lz yuzu-159dec01ee02b156d5733b542aedc8a4f01b4602.tar.xz yuzu-159dec01ee02b156d5733b542aedc8a4f01b4602.tar.zst yuzu-159dec01ee02b156d5733b542aedc8a4f01b4602.zip |
Diffstat (limited to 'src/yuzu/configuration/configure_hotkeys.h')
-rw-r--r-- | src/yuzu/configuration/configure_hotkeys.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/yuzu/configuration/configure_hotkeys.h b/src/yuzu/configuration/configure_hotkeys.h index 5fd1bcbfe..20ea3b515 100644 --- a/src/yuzu/configuration/configure_hotkeys.h +++ b/src/yuzu/configuration/configure_hotkeys.h @@ -4,6 +4,7 @@ #pragma once #include <memory> +#include <QStandardItemModel> #include <QWidget> namespace Common { @@ -54,14 +55,20 @@ private: void RestoreControllerHotkey(QModelIndex index); void RestoreHotkey(QModelIndex index); + void SetPollingResult(bool cancel); + QString GetButtonCombinationName(Core::HID::NpadButton button, bool home, bool capture) const; + std::unique_ptr<Ui::ConfigureHotkeys> ui; QStandardItemModel* model; - void SetPollingResult(Core::HID::NpadButton button, bool cancel); - QString GetButtonCombinationName(Core::HID::NpadButton button, bool home, bool capture) const; + bool pressed_home_button; + bool pressed_capture_button; + QModelIndex button_model_index; + Core::HID::NpadButton pressed_buttons; + Core::HID::EmulatedController* controller; std::unique_ptr<QTimer> timeout_timer; std::unique_ptr<QTimer> poll_timer; - std::optional<std::function<void(Core::HID::NpadButton, bool)>> input_setter; + std::optional<std::function<void(bool)>> input_setter; }; |