1 files changed, 30 insertions, 19 deletions

diff --git a/src/yuzu/configuration/configure_mouse_panning.cpp b/src/yuzu/configuration/configure_mouse_panning.cpp
index f183d2740..e37c546b0 100644
--- a/src/yuzu/configuration/configure_mouse_panning.cpp
+++ b/src/yuzu/configuration/configure_mouse_panning.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <QCloseEvent>
+#include <QMessageBox>
 
 #include "common/settings.h"
 #include "ui_configure_mouse_panning.h"
@@ -27,31 +28,34 @@ void ConfigureMousePanning::SetConfiguration(float right_stick_deadzone, float r
     ui->enable->setChecked(Settings::values.mouse_panning.GetValue());
     ui->x_sensitivity->setValue(Settings::values.mouse_panning_x_sensitivity.GetValue());
     ui->y_sensitivity->setValue(Settings::values.mouse_panning_y_sensitivity.GetValue());
-    ui->deadzone_x_counterweight->setValue(
-        Settings::values.mouse_panning_deadzone_x_counterweight.GetValue());
-    ui->deadzone_y_counterweight->setValue(
-        Settings::values.mouse_panning_deadzone_y_counterweight.GetValue());
+    ui->deadzone_counterweight->setValue(
+        Settings::values.mouse_panning_deadzone_counterweight.GetValue());
     ui->decay_strength->setValue(Settings::values.mouse_panning_decay_strength.GetValue());
     ui->min_decay->setValue(Settings::values.mouse_panning_min_decay.GetValue());
 
     if (right_stick_deadzone > 0.0f || right_stick_range != 1.0f) {
-        ui->warning_label->setText(QString::fromStdString(
-            "Mouse panning works better with a deadzone of 0% and a range of 100%.\n"
-            "Current values are " +
-            std::to_string(static_cast<int>(right_stick_deadzone * 100.0f)) + "% and " +
-            std::to_string(static_cast<int>(right_stick_range * 100.0f)) + "% respectively."));
-    } else {
-        ui->warning_label->hide();
+        const QString right_stick_deadzone_str =
+            QString::fromStdString(std::to_string(static_cast<int>(right_stick_deadzone * 100.0f)));
+        const QString right_stick_range_str =
+            QString::fromStdString(std::to_string(static_cast<int>(right_stick_range * 100.0f)));
+
+        ui->warning_label->setText(
+            tr("Mouse panning works better with a deadzone of 0% and a range of 100%.\nCurrent "
+               "values are %1% and %2% respectively.")
+                .arg(right_stick_deadzone_str, right_stick_range_str));
+    }
+
+    if (Settings::values.mouse_enabled) {
+        ui->warning_label->setText(
+            tr("Emulated mouse is enabled. This is incompatible with mouse panning."));
     }
 }
 
 void ConfigureMousePanning::SetDefaultConfiguration() {
     ui->x_sensitivity->setValue(Settings::values.mouse_panning_x_sensitivity.GetDefault());
     ui->y_sensitivity->setValue(Settings::values.mouse_panning_y_sensitivity.GetDefault());
-    ui->deadzone_x_counterweight->setValue(
-        Settings::values.mouse_panning_deadzone_x_counterweight.GetDefault());
-    ui->deadzone_y_counterweight->setValue(
-        Settings::values.mouse_panning_deadzone_y_counterweight.GetDefault());
+    ui->deadzone_counterweight->setValue(
+        Settings::values.mouse_panning_deadzone_counterweight.GetDefault());
     ui->decay_strength->setValue(Settings::values.mouse_panning_decay_strength.GetDefault());
     ui->min_decay->setValue(Settings::values.mouse_panning_min_decay.GetDefault());
 }
@@ -68,12 +72,19 @@ void ConfigureMousePanning::ApplyConfiguration() {
     Settings::values.mouse_panning = ui->enable->isChecked();
     Settings::values.mouse_panning_x_sensitivity = static_cast<float>(ui->x_sensitivity->value());
     Settings::values.mouse_panning_y_sensitivity = static_cast<float>(ui->y_sensitivity->value());
-    Settings::values.mouse_panning_deadzone_x_counterweight =
-        static_cast<float>(ui->deadzone_x_counterweight->value());
-    Settings::values.mouse_panning_deadzone_y_counterweight =
-        static_cast<float>(ui->deadzone_y_counterweight->value());
+    Settings::values.mouse_panning_deadzone_counterweight =
+        static_cast<float>(ui->deadzone_counterweight->value());
     Settings::values.mouse_panning_decay_strength = static_cast<float>(ui->decay_strength->value());
     Settings::values.mouse_panning_min_decay = static_cast<float>(ui->min_decay->value());
 
+    if (Settings::values.mouse_enabled && Settings::values.mouse_panning) {
+        Settings::values.mouse_panning = false;
+        QMessageBox::critical(
+            this, tr("Emulated mouse is enabled"),
+            tr("Real mouse input and mouse panning are incompatible. Please disable the "
+               "emulated mouse in input advanced settings to allow mouse panning."));
+        return;
+    }
+
     accept();
 }