diff --git a/src/duckstation-qt/controllerglobalsettingswidget.cpp b/src/duckstation-qt/controllerglobalsettingswidget.cpp
index 5741f0fce..db1959e7a 100644
--- a/src/duckstation-qt/controllerglobalsettingswidget.cpp
+++ b/src/duckstation-qt/controllerglobalsettingswidget.cpp
@@ -21,6 +21,10 @@ ControllerGlobalSettingsWidget::ControllerGlobalSettingsWidget(QWidget* parent,
ControllerSettingWidgetBinder::BindWidgetToInputProfileBool(sif, m_ui.enableSDLSource, "InputSources", "SDL", true);
ControllerSettingWidgetBinder::BindWidgetToInputProfileBool(sif, m_ui.enableSDLEnhancedMode, "InputSources",
"SDLControllerEnhancedMode", false);
+ ControllerSettingWidgetBinder::BindWidgetToInputProfileBool(sif, m_ui.enableTouchPadAsPointer, "InputSources",
+ "SDLTouchpadAsPointer", false);
+ ControllerSettingWidgetBinder::BindWidgetToInputProfileBool(sif, m_ui.enableSDLPS5PlayerLED, "InputSources",
+ "SDLPS5PlayerLED", false);
connect(m_ui.enableSDLSource, &QCheckBox::checkStateChanged, this,
&ControllerGlobalSettingsWidget::updateSDLOptionsEnabled);
connect(m_ui.ledSettings, &QToolButton::clicked, this, &ControllerGlobalSettingsWidget::ledSettingsClicked);
@@ -137,8 +141,14 @@ void ControllerGlobalSettingsWidget::ledSettingsClicked()
void ControllerGlobalSettingsWidget::updateSDLOptionsEnabled()
{
const bool enabled = m_ui.enableSDLSource->isChecked();
- m_ui.enableSDLEnhancedMode->setEnabled(enabled);
- m_ui.ledSettings->setEnabled(enabled);
+ if (m_ui.enableSDLEnhancedMode)
+ m_ui.enableSDLEnhancedMode->setEnabled(enabled);
+ if (m_ui.enableTouchPadAsPointer)
+ m_ui.enableTouchPadAsPointer->setEnabled(enabled);
+ if (m_ui.enableSDLPS5PlayerLED)
+ m_ui.enableSDLPS5PlayerLED->setEnabled(enabled);
+ if (m_ui.ledSettings)
+ m_ui.ledSettings->setEnabled(enabled);
}
ControllerLEDSettingsDialog::ControllerLEDSettingsDialog(QWidget* parent, ControllerSettingsWindow* dialog)
@@ -151,10 +161,6 @@ ControllerLEDSettingsDialog::ControllerLEDSettingsDialog(QWidget* parent, Contro
linkButton(m_ui.SDL2LED, 2);
linkButton(m_ui.SDL3LED, 3);
- SettingsInterface* sif = dialog->getEditingSettingsInterface();
-
- ControllerSettingWidgetBinder::BindWidgetToInputProfileBool(sif, m_ui.enableSDLPS5PlayerLED, "InputSources",
- "SDLPS5PlayerLED", false);
connect(m_ui.buttonBox->button(QDialogButtonBox::Close), &QPushButton::clicked, this, &QDialog::accept);
}
diff --git a/src/duckstation-qt/controllerglobalsettingswidget.ui b/src/duckstation-qt/controllerglobalsettingswidget.ui
index 28a7483e7..57e62d1d9 100644
--- a/src/duckstation-qt/controllerglobalsettingswidget.ui
+++ b/src/duckstation-qt/controllerglobalsettingswidget.ui
@@ -7,7 +7,7 @@
0
0
902
- 800
+ 743
@@ -98,7 +98,7 @@
-
-
+
@@ -109,13 +109,17 @@
SDL Input Source
- -
-
+
-
+
- The SDL input source supports most controllers, and provides advanced functionality for DualShock 4 / DualSense pads in Bluetooth mode (Vibration / LED Control).
+ Enable MFI Driver
-
- true
+
+
+ -
+
+
+ Enable IOKit Driver
@@ -126,12 +130,42 @@
+ -
+
+
+ The SDL input source supports most controllers, and provides Vibration/LED functionality for DualShock 4 / DualSense pads in Bluetooth mode.
+
+
+ true
+
+
+
+ -
+
+
+ Enable Touchpad
+
+
+
-
+
+
+ DualShock 4 / DualSense Enhanced Mode
+
+
+
+ -
-
-
+
+
+
+ 0
+ 0
+
+
- DualShock 4 / DualSense Enhanced Mode
+ Enable DualSense Player LED
@@ -147,20 +181,6 @@
- -
-
-
- Enable IOKit Driver
-
-
-
- -
-
-
- Enable MFI Driver
-
-
-
@@ -287,6 +307,24 @@
+ -
+
+
-
+
+
+ Enable Mouse Mapping
+
+
+
+ -
+
+
+ Use Raw Input
+
+
+
+
+
-
@@ -342,24 +380,6 @@
- -
-
-
-
-
-
- Enable Mouse Mapping
-
-
-
- -
-
-
- Use Raw Input
-
-
-
-
-
@@ -371,7 +391,7 @@
20
- 40
+ 1
diff --git a/src/duckstation-qt/controllerledsettingsdialog.ui b/src/duckstation-qt/controllerledsettingsdialog.ui
index 8e0c00a1d..a12db7ef0 100644
--- a/src/duckstation-qt/controllerledsettingsdialog.ui
+++ b/src/duckstation-qt/controllerledsettingsdialog.ui
@@ -7,7 +7,7 @@
0
0
501
- 128
+ 108
@@ -38,18 +38,6 @@
- -
-
-
- SDL-2 LED
-
-
-
-
-
-
-
-
-
-
@@ -62,41 +50,30 @@
- -
-
-
- QLayout::SetDefaultConstraint
+
-
+
+
+ SDL-2 LED
-
- 0
+
+
-
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
-
-
-
-
-
- 0
- 0
-
-
-
- Enable DualSense Player LED
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- QDialogButtonBox::Close
-
-
-
-
+
+ QDialogButtonBox::StandardButton::Close
+
+