RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-01-12 11:40:16 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Qt/input: fix pressure intensity button availability
Some checks are pending
Generate Translation Template / Generate Translation Template (push) Waiting to run
Details
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux-aarch64.sh, gcc, rpcs3/rpcs3-ci-jammy-aarch64:1.7, ubuntu-24.04-arm) (push) Waiting to run
Details
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux.sh, gcc, rpcs3/rpcs3-ci-jammy:1.7, ubuntu-24.04) (push) Waiting to run
Details
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1, rpcs3/rpcs3-binaries-linux-arm64, /rpcs3/.ci/build-linux-aarch64.sh, clang, rpcs3/rpcs3-ci-jammy-aarch64:1.7, ubuntu-24.04-arm) (push) Waiting to run
Details
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (d812f1254a1157c80fd402f94446310560f54e5f, rpcs3/rpcs3-binaries-linux, /rpcs3/.ci/build-linux.sh, clang, rpcs3/rpcs3-ci-jammy:1.7, ubuntu-24.04) (push) Waiting to run
Details
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (0, 51ae32f468089a8169aaf1567de355ff4a3e0842, rpcs3/rpcs3-binaries-mac, Intel) (push) Waiting to run
Details
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (1, 8e21bdbc40711a3fccd18fbf17b742348b0f4281, rpcs3/rpcs3-binaries-mac-arm64, Apple Silicon) (push) Waiting to run
Details
Build RPCS3 / RPCS3 Windows (push) Waiting to run
Details
Build RPCS3 / RPCS3 Windows Clang (win64, clang, clang64) (push) Waiting to run
Details
Build RPCS3 / RPCS3 FreeBSD (push) Waiting to run
Details

Browse source
This commit is contained in:
Megamouse 2026-01-07 21:46:05 +01:00
parent c22d2b51bb
commit ef5a4bf7e4
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/Io/PadHandler.cpp
View file

@ -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
};
}

2
rpcs3/Emu/Io/PadHandler.h
View file

@ -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>;

2
rpcs3/Input/sdl_pad_handler.cpp
View file

@ -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;
}

4
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file

@ -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;