From 12f86f89fc2f8c77e99fdec37c8d3d4f63487192 Mon Sep 17 00:00:00 2001 From: german77 Date: Mon, 5 Feb 2024 22:34:05 -0600 Subject: yuzu: Make controller keys easier to assign --- src/yuzu/configuration/configure_hotkeys.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/yuzu/configuration/configure_hotkeys.h') 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 +#include #include 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; 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 timeout_timer; std::unique_ptr poll_timer; - std::optional> input_setter; + std::optional> input_setter; }; -- cgit v1.2.3