Merge pull request #8450 from jordan-woyak/mapping-button-fix

DolphinQt: Fix output mapping button spacebar activation and tooltip.

2 files changed, 16 insertions, 11 deletions

diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
index a9a142276f..6b1b1fce73 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
@@ -53,10 +53,17 @@ MappingButton::MappingButton(MappingWidget* parent, ControlReference* ref, bool
 
   setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
 
-  setToolTip(
-      tr("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options."));
+  if (IsInput())
+  {
+    setToolTip(
+        tr("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options."));
+  }
+  else
+  {
+    setToolTip(tr("Left/Right-click to configure output.\nMiddle-click to clear."));
+  }
 
-  connect(this, &MappingButton::clicked, this, &MappingButton::Detect);
+  connect(this, &MappingButton::clicked, this, &MappingButton::Clicked);
 
   if (indicator)
     connect(parent, &MappingWidget::Update, this, &MappingButton::UpdateIndicator);
@@ -74,10 +81,13 @@ void MappingButton::AdvancedPressed()
   m_parent->SaveSettings();
 }
 
-void MappingButton::Detect()
+void MappingButton::Clicked()
 {
   if (!m_reference->IsInput())
+  {
+    AdvancedPressed();
     return;
+  }
 
   const auto default_device_qualifier = m_parent->GetController()->GetDefaultDevice();
 
@@ -141,12 +151,6 @@ void MappingButton::mouseReleaseEvent(QMouseEvent* event)
 {
   switch (event->button())
   {
-  case Qt::MouseButton::LeftButton:
-    if (m_reference->IsInput())
-      QPushButton::mouseReleaseEvent(event);
-    else
-      AdvancedPressed();
-    return;
   case Qt::MouseButton::MidButton:
     Clear();
     return;
@@ -154,6 +158,7 @@ void MappingButton::mouseReleaseEvent(QMouseEvent* event)
     AdvancedPressed();
     return;
   default:
+    QPushButton::mouseReleaseEvent(event);
     return;
   }
 }
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingButton.h b/Source/Core/DolphinQt/Config/Mapping/MappingButton.h
index 464d09e9f6..775be6ec97 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingButton.h
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingButton.h
@@ -18,7 +18,6 @@ class MappingButton : public ElidedButton
 public:
   MappingButton(MappingWidget* widget, ControlReference* ref, bool indicator);
 
-  void Detect();
   bool IsInput() const;
 
 private:
@@ -27,6 +26,7 @@ private:
   void ConfigChanged();
   void AdvancedPressed();
 
+  void Clicked();
   void mouseReleaseEvent(QMouseEvent* event) override;
 
   MappingWidget* m_parent;