mirror of
https://github.com/RPCS3/rpcs3.git
synced 2026-01-31 01:25:18 +01:00
Qt/input: fix pressure intensity button availability
This commit is contained in:
@@ -219,7 +219,7 @@ pad_capabilities PadHandlerBase::get_capabilities(const std::string& /*pad_id*/)
|
||||
.has_rumble = b_has_rumble,
|
||||
.has_accel = b_has_motion,
|
||||
.has_gyro = b_has_motion,
|
||||
.has_pressure_sensitivity = b_has_pressure_intensity_button
|
||||
.has_pressure_intensity_button = b_has_pressure_intensity_button
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -90,7 +90,7 @@ struct pad_capabilities
|
||||
bool has_rumble = false;
|
||||
bool has_accel = false;
|
||||
bool has_gyro = false;
|
||||
bool has_pressure_sensitivity = false;
|
||||
bool has_pressure_intensity_button = true;
|
||||
};
|
||||
|
||||
using pad_preview_values = std::array<int, 6>;
|
||||
|
||||
@@ -738,7 +738,7 @@ pad_capabilities sdl_pad_handler::get_capabilities(const std::string& pad_id)
|
||||
capabilities.has_rumble &= dev->sdl.has_rumble;
|
||||
capabilities.has_accel &= dev->sdl.has_accel;
|
||||
capabilities.has_gyro &= dev->sdl.has_gyro;
|
||||
capabilities.has_pressure_sensitivity &= dev->sdl.is_ds3_with_pressure_buttons;
|
||||
capabilities.has_pressure_intensity_button &= !dev->sdl.is_ds3_with_pressure_buttons; // Only allow if there's not pressure sensitivity
|
||||
|
||||
return capabilities;
|
||||
}
|
||||
|
||||
@@ -482,7 +482,7 @@ void pad_settings_dialog::InitButtons()
|
||||
if ((!is_connected || !m_remap_timer.isActive()) && (
|
||||
is_connected != m_enable_buttons ||
|
||||
(is_connected && (
|
||||
!capabilities.has_pressure_sensitivity != m_enable_pressure_intensity_button ||
|
||||
capabilities.has_pressure_intensity_button != m_enable_pressure_intensity_button ||
|
||||
capabilities.has_rumble != m_enable_rumble ||
|
||||
capabilities.has_battery_led != m_enable_battery_led ||
|
||||
(capabilities.has_led || capabilities.has_mono_led) != m_enable_led ||
|
||||
@@ -490,7 +490,7 @@ void pad_settings_dialog::InitButtons()
|
||||
{
|
||||
if (is_connected)
|
||||
{
|
||||
m_enable_pressure_intensity_button = !capabilities.has_pressure_sensitivity;
|
||||
m_enable_pressure_intensity_button = capabilities.has_pressure_intensity_button;
|
||||
m_enable_rumble = capabilities.has_rumble;
|
||||
m_enable_battery_led = capabilities.has_battery_led;
|
||||
m_enable_led = capabilities.has_led || capabilities.has_mono_led;
|
||||
|
||||
Reference in New Issue
Block a user