summaryrefslogtreecommitdiff
path: root/src/yuzu/configuration/configure_hotkeys.h
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2024-02-05 22:34:05 -0600
committerNarr the Reg <juangerman-13@hotmail.com>2024-02-06 16:51:39 -0600
commit12f86f89fc2f8c77e99fdec37c8d3d4f63487192 (patch)
treeb5d7ad2ad94f396a7c3de414681271a8ae95af4a /src/yuzu/configuration/configure_hotkeys.h
parenta2f23746c26e0882ff8ffadc814a09859efe54e2 (diff)
yuzu: Make controller keys easier to assign
Diffstat (limited to 'src/yuzu/configuration/configure_hotkeys.h')
-rw-r--r--src/yuzu/configuration/configure_hotkeys.h13
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;
};