From ef5a4bf7e4cd6dddc3dbf10782eba5925b8bd981 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 7 Jan 2026 21:46:05 +0100 Subject: [PATCH] Qt/input: fix pressure intensity button availability --- rpcs3/Emu/Io/PadHandler.cpp | 2 +- rpcs3/Emu/Io/PadHandler.h | 2 +- rpcs3/Input/sdl_pad_handler.cpp | 2 +- rpcs3/rpcs3qt/pad_settings_dialog.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/Io/PadHandler.cpp b/rpcs3/Emu/Io/PadHandler.cpp index d25ba1379c..9110687a9c 100644 --- a/rpcs3/Emu/Io/PadHandler.cpp +++ b/rpcs3/Emu/Io/PadHandler.cpp @@ -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 }; } diff --git a/rpcs3/Emu/Io/PadHandler.h b/rpcs3/Emu/Io/PadHandler.h index a27e0bcc50..98cca72a7d 100644 --- a/rpcs3/Emu/Io/PadHandler.h +++ b/rpcs3/Emu/Io/PadHandler.h @@ -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; diff --git a/rpcs3/Input/sdl_pad_handler.cpp b/rpcs3/Input/sdl_pad_handler.cpp index 1b6ddbc40c..c47514f6ae 100644 --- a/rpcs3/Input/sdl_pad_handler.cpp +++ b/rpcs3/Input/sdl_pad_handler.cpp @@ -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; } diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp index 36ece3b0ec..2940143a27 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp @@ -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;