CCF_100
/
citra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Account for analog buttons when checking for used buttons 

circle mod and analog_from_buttons weren't being accounted for.
master
Vitor Kiguchi 2021-04-05 19:38:54 +07:00
parent b3cab3c450
commit 0e2edbb0d2
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/citra_qt/configuration/configure_input.cpp
Unescape Escape View File

@ -350,6 +350,17 @@ QList<QKeySequence> ConfigureInput::GetUsedKeyboardKeys() {
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++) {
auto sub_button = Common::ParamPackage{analog_param.Get(analog_sub_buttons[sub_button_id], "")};
list << QKeySequence(sub_button.Get("code", 0));
}
}
}
return list;
}