archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Qt: Fix SettingsDialog crash introduced by removal of groupboxes

Browse source
This commit is contained in:
Unknown 2017-12-01 00:37:53 +01:00 • committed by Ani
parent c077426e95
commit 7165001b68
1 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file

@ -357,16 +357,22 @@ void pad_settings_dialog::keyPressEvent(QKeyEvent *keyEvent)
void pad_settings_dialog::UpdateLabel(bool is_reset) void pad_settings_dialog::UpdateLabel(bool is_reset)
{ {
if (is_reset) if (is_reset)
{
if (m_handler->has_rumble())
{ {
ui->chb_vibration_large->setChecked((bool)m_handler_cfg->enable_vibration_motor_large); ui->chb_vibration_large->setChecked((bool)m_handler_cfg->enable_vibration_motor_large);
ui->chb_vibration_small->setChecked((bool)m_handler_cfg->enable_vibration_motor_small); ui->chb_vibration_small->setChecked((bool)m_handler_cfg->enable_vibration_motor_small);
ui->chb_vibration_switch->setChecked((bool)m_handler_cfg->switch_vibration_motors); ui->chb_vibration_switch->setChecked((bool)m_handler_cfg->switch_vibration_motors);
}
if (m_handler->has_deadzones())
{
ui->slider_trigger_left->setValue(m_handler_cfg->ltriggerthreshold); ui->slider_trigger_left->setValue(m_handler_cfg->ltriggerthreshold);
ui->slider_trigger_right->setValue(m_handler_cfg->rtriggerthreshold); ui->slider_trigger_right->setValue(m_handler_cfg->rtriggerthreshold);
ui->slider_stick_left->setValue(m_handler_cfg->lstickdeadzone); ui->slider_stick_left->setValue(m_handler_cfg->lstickdeadzone);
ui->slider_stick_right->setValue(m_handler_cfg->rstickdeadzone); ui->slider_stick_right->setValue(m_handler_cfg->rstickdeadzone);
} }
}
for (auto& entry : m_cfg_entries) for (auto& entry : m_cfg_entries)
{ {
@ -394,13 +400,22 @@ void pad_settings_dialog::SaveConfig()
{ {
entry.second.cfg_name->from_string(entry.second.key); entry.second.cfg_name->from_string(entry.second.key);
} }
if (m_handler->has_rumble())
{
m_handler_cfg->enable_vibration_motor_large.set(ui->chb_vibration_large->isChecked()); m_handler_cfg->enable_vibration_motor_large.set(ui->chb_vibration_large->isChecked());
m_handler_cfg->enable_vibration_motor_small.set(ui->chb_vibration_small->isChecked()); m_handler_cfg->enable_vibration_motor_small.set(ui->chb_vibration_small->isChecked());
m_handler_cfg->switch_vibration_motors.set(ui->chb_vibration_switch->isChecked()); m_handler_cfg->switch_vibration_motors.set(ui->chb_vibration_switch->isChecked());
}
if (m_handler->has_deadzones())
{
m_handler_cfg->ltriggerthreshold.set(ui->slider_trigger_left->value()); m_handler_cfg->ltriggerthreshold.set(ui->slider_trigger_left->value());
m_handler_cfg->rtriggerthreshold.set(ui->slider_trigger_right->value()); m_handler_cfg->rtriggerthreshold.set(ui->slider_trigger_right->value());
m_handler_cfg->lstickdeadzone.set(ui->slider_stick_left->value()); m_handler_cfg->lstickdeadzone.set(ui->slider_stick_left->value());
m_handler_cfg->rstickdeadzone.set(ui->slider_stick_right->value()); m_handler_cfg->rstickdeadzone.set(ui->slider_stick_right->value());
}
m_handler_cfg->save(); m_handler_cfg->save();
} }