summaryrefslogtreecommitdiff
path: root/src/yuzu/configuration/configure_hotkeys.h
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-05-16 10:06:15 -0400
committerGitHub <noreply@github.com>2023-05-16 10:06:15 -0400
commita540d248f3eca41544f685b5efb71165f0a050a2 (patch)
treecf2f104a368873ae57bf363239934173cd8f3113 /src/yuzu/configuration/configure_hotkeys.h
parentbbb6b58aa4d86ccf1d23b5bdb3f81a50775848a1 (diff)
parentceb65c259a8aeb3e5aabe8a94235073c9e1e1c80 (diff)
Merge pull request #10107 from grimkor/allow-fully-customised-hotkeys
Allow fully customised controller hotkeys
Diffstat (limited to 'src/yuzu/configuration/configure_hotkeys.h')
-rw-r--r--src/yuzu/configuration/configure_hotkeys.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/yuzu/configuration/configure_hotkeys.h b/src/yuzu/configuration/configure_hotkeys.h
index e8e414320..5fd1bcbfe 100644
--- a/src/yuzu/configuration/configure_hotkeys.h
+++ b/src/yuzu/configuration/configure_hotkeys.h
@@ -59,7 +59,7 @@ private:
QStandardItemModel* model;
void SetPollingResult(Core::HID::NpadButton button, bool cancel);
- QString GetButtonName(Core::HID::NpadButton button) const;
+ QString GetButtonCombinationName(Core::HID::NpadButton button, bool home, bool capture) const;
Core::HID::EmulatedController* controller;
std::unique_ptr<QTimer> timeout_timer;
std::unique_ptr<QTimer> poll_timer;