octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4722 from adityaruplaha/input-fixup 

ConfigureInput::GetUsedKeyboardKeys(): Change index of home button to use NativeButton instead of magic number.
This commit is contained in:
Weiyi Wang 2019-04-06 11:25:48 -04:00 committed by GitHub
parent 14730ed560 ebba9f5a70
commit c2b514cb97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,16 +287,16 @@ void ConfigureInput::OnHotkeysChanged(QList<QKeySequence> new_key_list) {
QList<QKeySequence> ConfigureInput::GetUsedKeyboardKeys() { QList<QKeySequence> ConfigureInput::GetUsedKeyboardKeys() {
QList<QKeySequence> list; QList<QKeySequence> list;
for (int button = 0; button < Settings::NativeButton::NumButtons; button++) { for (int button = 0; button < Settings::NativeButton::NumButtons; button++) {
auto button_param = buttons_param[button]; // TODO(adityaruplaha): Add home button to list when we finally emulate it
if (button == Settings::NativeButton::Home) {
continue;
}
auto button_param = buttons_param[button];
if (button_param.Get("engine", "") == "keyboard") { if (button_param.Get("engine", "") == "keyboard") {
list << QKeySequence(button_param.Get("code", 0)); list << QKeySequence(button_param.Get("code", 0));
} }
} }
// TODO(adityaruplaha): Add home button to list when we finally emulate it
// Button ID of home button is 14: Referred from citra_qt/configuration/config.cpp
list.removeOne(list.indexOf(QKeySequence(buttons_param[14].Get("code", 0))));
return list; return list;
} }