N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more fixes

Browse source
This commit is contained in:
Valentin Vanelslande 2018-12-28 21:26:50 -05:00
parent 39140bbff8
commit 860860397b
1 changed files with 125 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -100,11 +100,9 @@ ConfigureInput::ConfigureInput(QWidget* parent)
ui->setupUi(this); ui->setupUi(this);
setFocusPolicy(Qt::ClickFocus); setFocusPolicy(Qt::ClickFocus);
for (const auto& profile : Settings::values::profiles) { for (const auto& profile : Settings::values.input_profiles) {
ui->profile->addItem(QString::fromStdString(profile.name)); ui->profile->addItem(QString::fromStdString(profile.name));
} }
ui->profile->addItem(QString::fromStdString(Settings::values.profiles[i].name));
}
ui->profile->setCurrentIndex(Settings::values.current_input_profile); ui->profile->setCurrentIndex(Settings::values.current_input_profile);
@ -171,7 +169,8 @@ for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs; analog_i
for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; sub_button_id++) { for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; sub_button_id++) {
if (!analog_map_buttons[analog_id][sub_button_id]) if (!analog_map_buttons[analog_id][sub_button_id])
continue; continue;
analog_map_buttons[analog_id][sub_button_id]->setContextMenuPolicy(Qt::CustomContextMenu); analog_map_buttons[analog_id][sub_button_id]->setContextMenuPolicy(
Qt::CustomContextMenu);
connect(analog_map_buttons[analog_id][sub_button_id], &QPushButton::released, [=]() { connect(analog_map_buttons[analog_id][sub_button_id], &QPushButton::released, [=]() {
handleClick( handleClick(
analog_map_buttons[analog_id][sub_button_id], analog_map_buttons[analog_id][sub_button_id],
@ -202,8 +201,8 @@ for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs; analog_i
applyConfiguration(); applyConfiguration();
Settings::SaveProfile(ui->profile->currentIndex()); Settings::SaveProfile(ui->profile->currentIndex());
}); });
context_menu.exec( context_menu.exec(analog_map_buttons[analog_id][sub_button_id]->mapToGlobal(
analog_map_buttons[analog_id][sub_button_id]->mapToGlobal(menu_location)); menu_location));
}); });
} }
connect(analog_map_stick[analog_id], &QPushButton::released, [=]() { connect(analog_map_stick[analog_id], &QPushButton::released, [=]() {