diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2019-11-03 18:17:51 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2019-11-03 18:17:51 -0600 |
| commit | 1bdf43dd78ac5b0ffdd6e5bdf3290166502b39f3 (patch) | |
| tree | b19152fe93d7435d2a179ed9f8a03325a06dd0e7 /Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp | |
| parent | 0f4c971326ae9389b3ad55b0fefacb708d148f4d (diff) | |
DolphinQt: Fix spacebar not activating output mapping buttons.
Diffstat (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp index a9a142276f..d472aa619f 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp @@ -56,7 +56,7 @@ MappingButton::MappingButton(MappingWidget* parent, ControlReference* ref, bool setToolTip( tr("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options.")); - 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 +74,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 +144,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 +151,7 @@ void MappingButton::mouseReleaseEvent(QMouseEvent* event) AdvancedPressed(); return; default: + QPushButton::mouseReleaseEvent(event); return; } } |
