Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added Debug Button

Browse source
This commit is contained in:
RicBent 2018-12-28 12:47:50 -06:00
parent 3989c17cb0
commit 403d2f0058
7 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/citra_qt/configuration/config.cpp
View file

@ -28,7 +28,7 @@ Config::~Config() {
const std::array<int, Settings::NativeButton::NumButtons> Config::default_buttons = {
Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_T, Qt::Key_G, Qt::Key_F, Qt::Key_H,
Qt::Key_Q, Qt::Key_W, Qt::Key_M, Qt::Key_N, Qt::Key_1, Qt::Key_2, Qt::Key_B,
Qt::Key_Q, Qt::Key_W, Qt::Key_M, Qt::Key_N, Qt::Key_P, Qt::Key_1, Qt::Key_2, Qt::Key_B,
};
const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{

6
src/citra_qt/configuration/configure_input.cpp
View file

@ -102,7 +102,8 @@ ConfigureInput::ConfigureInput(QWidget* parent)
button_map = {
ui->buttonA, ui->buttonB, ui->buttonX, ui->buttonY, ui->buttonDpadUp,
ui->buttonDpadDown, ui->buttonDpadLeft, ui->buttonDpadRight, ui->buttonL, ui->buttonR,
ui->buttonStart, ui->buttonSelect, ui->buttonZL, ui->buttonZR, ui->buttonHome,
ui->buttonStart, ui->buttonSelect, nullptr, ui->buttonZL, ui->buttonZR,
ui->buttonHome,
};
analog_map_buttons = {{
@ -273,7 +274,8 @@ void ConfigureInput::ClearAll() {
void ConfigureInput::updateButtonLabels() {
for (int button = 0; button < Settings::NativeButton::NumButtons; button++) {
button_map[button]->setText(ButtonToText(buttons_param[button]));
if (button_map[button])
button_map[button]->setText(ButtonToText(buttons_param[button]));
}
for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs; analog_id++) {