mirror of
https://github.com/Lime3DS/Lime3DS
synced 2024-12-28 10:02:31 -06:00
more fixes
This commit is contained in:
parent
39140bbff8
commit
860860397b
1 changed files with 125 additions and 126 deletions
|
@ -100,11 +100,9 @@ ConfigureInput::ConfigureInput(QWidget* parent)
|
|||
ui->setupUi(this);
|
||||
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(Settings::values.profiles[i].name));
|
||||
}
|
||||
|
||||
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++) {
|
||||
if (!analog_map_buttons[analog_id][sub_button_id])
|
||||
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, [=]() {
|
||||
handleClick(
|
||||
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();
|
||||
Settings::SaveProfile(ui->profile->currentIndex());
|
||||
});
|
||||
context_menu.exec(
|
||||
analog_map_buttons[analog_id][sub_button_id]->mapToGlobal(menu_location));
|
||||
context_menu.exec(analog_map_buttons[analog_id][sub_button_id]->mapToGlobal(
|
||||
menu_location));
|
||||
});
|
||||
}
|
||||
connect(analog_map_stick[analog_id], &QPushButton::released, [=]() {
|
||||
|
|
Loading…
Reference in a new issue