Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Qt: Pad settings dialog fixes #10866

Merged
merged 5 commits into from Sep 15, 2021
Merged

Qt: Pad settings dialog fixes #10866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b30acec
Emu.Load: add more logging
Megamouse Sep 12, 2021
c985fab
Qt: fix player selection checks
Megamouse Sep 15, 2021
d4badca
Qt: reset config when null pad handler is selected
Megamouse Sep 15, 2021
bdf183d
Qt: Relocate pad handler parameter changes
Megamouse Sep 15, 2021
4b07e1e
Qt: Reset stick positions on pad handler change
Megamouse Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions rpcs3/Emu/System.cpp
View file
Open in desktop
Expand Up @@ -137,6 +137,8 @@ void Emulator::Init(bool add_only)
{
if (const fs::file cfg_file{m_config_path, fs::read + fs::create})
{
sys_log.notice("Applying config override: %s", m_config_path);

if (!g_cfg.from_string(cfg_file.to_string()))
{
sys_log.fatal("Failed to apply config: %s. Proceeding with regular configuration.", m_config_path);
Expand All @@ -162,6 +164,8 @@ void Emulator::Init(bool add_only)

if (const fs::file cfg_file{cfg_path, fs::read + fs::create})
{
sys_log.notice("Applying global config: %s", cfg_path);

if (!g_cfg.from_string(cfg_file.to_string()))
{
sys_log.fatal("Failed to apply global config: %s", cfg_path);
Expand Down Expand Up @@ -517,6 +521,8 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
m_title_id = title_id;
}

sys_log.notice("Selected config: %s", m_config_path);

{
Init(add_only);

Expand Down
47 changes: 22 additions & 25 deletions rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file
Open in desktop
Expand Up @@ -558,18 +558,6 @@ void pad_settings_dialog::ReloadButtons()

updateButton(button_ids::id_pressure_intensity, ui->b_pressure_intensity, &cfg.pressure_intensity_button);

m_min_force = m_handler->vibration_min;
m_max_force = m_handler->vibration_max;

// Enable Vibration Checkboxes
m_enable_rumble = m_handler->has_rumble();

// Enable Deadzone Settings
m_enable_deadzones = m_handler->has_deadzones();

// Enable Pressure Sensitivity Settings
m_enable_pressure_intensity_button = m_handler->has_pressure_intensity_button();

UpdateLabels(true);
}

Expand Down Expand Up @@ -915,7 +903,7 @@ void pad_settings_dialog::UpdateLabels(bool is_reset)
{
if (is_reset)
{
const auto& cfg = GetPlayerConfig();
const cfg_pad& cfg = GetPlayerConfig();

// Update device class
ui->chooseClass->setCurrentIndex(cfg.device_class_type);
Expand Down Expand Up @@ -1176,6 +1164,7 @@ void pad_settings_dialog::ChangeHandler()
switch (m_handler->m_type)
{
case pad_handler::null:
GetPlayerConfig().from_default();
if (is_ldd_pad)
m_description = tooltips.gamepad_settings.ldd_pad;
else
Expand Down Expand Up @@ -1216,6 +1205,25 @@ void pad_settings_dialog::ChangeHandler()
}
ui->l_description->setText(m_description);

// Update parameters
m_min_force = m_handler->vibration_min;
m_max_force = m_handler->vibration_max;

// Reset parameters
m_lx = 0;
m_ly = 0;
m_rx = 0;
m_ry = 0;

// Enable Vibration Checkboxes
m_enable_rumble = m_handler->has_rumble();

// Enable Deadzone Settings
m_enable_deadzones = m_handler->has_deadzones();

// Enable Pressure Sensitivity Settings
m_enable_pressure_intensity_button = m_handler->has_pressure_intensity_button();

// Change our contextual widgets
ui->left_stack->setCurrentIndex((m_handler->m_type == pad_handler::keyboard) ? 1 : 0);
ui->right_stack->setCurrentIndex((m_handler->m_type == pad_handler::keyboard) ? 1 : 0);
Expand Down Expand Up @@ -1518,7 +1526,7 @@ void pad_settings_dialog::RefreshHandlers()

void pad_settings_dialog::ApplyCurrentPlayerConfig(int new_player_id)
{
if (!m_handler || new_player_id < 0)
if (!m_handler || new_player_id < 0 || static_cast<u32>(new_player_id) >= g_cfg_input.player.size())
{
return;
}
Expand All @@ -1528,17 +1536,6 @@ void pad_settings_dialog::ApplyCurrentPlayerConfig(int new_player_id)
auto& player = g_cfg_input.player[m_last_player_id];
m_last_player_id = new_player_id;

// Check for invalid selection
if (!ui->chooseDevice->isEnabled() || ui->chooseDevice->currentIndex() < 0)
{
const u32 played_id = GetPlayerIndex();
g_cfg_input.player[played_id]->handler.from_default();
g_cfg_input.player[played_id]->device.from_default();
g_cfg_input.player[played_id]->config.from_default();

return;
}

// Check for duplicate button choices
if (m_handler->m_type != pad_handler::null)
{
Expand Down