citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #5755 from vitor-k/mod_used 

citra_qt/configure_input: Account for analog buttons when checking for used buttons
This commit is contained in:
SachinVin 2022-01-30 21:52:40 +05:30 committed by GitHub
parent d35a7a8e23 80fdc3e7c8
commit f66ba43e0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/citra_qt/configuration/configure_input.cpp
View File

@ -368,6 +368,18 @@ QList<QKeySequence> ConfigureInput::GetUsedKeyboardKeys() {
list << QKeySequence(button_param.Get("code", 0)); list << QKeySequence(button_param.Get("code", 0));
} }
} }
for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs; ++analog_id) {
auto analog_param = analogs_param[analog_id];
if (analog_param.Get("engine", "") == "analog_from_button") {
for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; ++sub_button_id) {
const Common::ParamPackage sub_button{
analog_param.Get(analog_sub_buttons[sub_button_id], "")};
list << QKeySequence(sub_button.Get("code", 0));
}
}
}
return list; return list;
} }