diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2025-02-01 14:33:03 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2025-02-15 14:15:51 -0600 |
| commit | 3189de6c7af808f62f622c744832b051f0f885ff (patch) | |
| tree | 5f2f8bc898d7acee7980bc0cd7891762928800dc /Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp | |
| parent | a8fae9b82683dd0ea766cb8c282b414707962255 (diff) | |
DolphinQt: Add setting to enable iterative input mappings.
Diffstat (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp index 3af4c2e00e..d0e1ce4bbe 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp @@ -11,8 +11,6 @@ #include "DolphinQt/Config/Mapping/IOWindow.h" #include "DolphinQt/Config/Mapping/MappingWidget.h" #include "DolphinQt/Config/Mapping/MappingWindow.h" -#include "DolphinQt/QtUtils/BlockUserInputFilter.h" -#include "DolphinQt/QtUtils/SetWindowDecorations.h" #include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" @@ -67,15 +65,10 @@ static QString RefToDisplayString(ControlReference* ref) return expression; } -bool MappingButton::IsInput() const -{ - return m_reference->IsInput(); -} - MappingButton::MappingButton(MappingWidget* parent, ControlReference* ref) : ElidedButton(RefToDisplayString(ref)), m_mapping_window(parent->GetParent()), m_reference(ref) { - if (IsInput()) + if (m_reference->IsInput()) { setToolTip( tr("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options.")); @@ -88,10 +81,8 @@ MappingButton::MappingButton(MappingWidget* parent, ControlReference* ref) connect(this, &MappingButton::clicked, this, &MappingButton::Clicked); connect(parent, &MappingWidget::ConfigChanged, this, &MappingButton::ConfigChanged); - connect(this, &MappingButton::ConfigChanged, [this] { - setText(RefToDisplayString(m_reference)); - m_is_mapping = false; - }); + connect(this, &MappingButton::ConfigChanged, + [this] { setText(RefToDisplayString(m_reference)); }); } void MappingButton::AdvancedPressed() @@ -114,7 +105,6 @@ void MappingButton::Clicked() return; } - m_is_mapping = true; m_mapping_window->QueueInputDetection(this); } @@ -131,14 +121,6 @@ void MappingButton::Clear() m_mapping_window->UnQueueInputDetection(this); } -void MappingButton::StartMapping() -{ - // Focus just makes it more clear which button is currently being mapped. - setFocus(); - setText(tr("[ Press Now ]")); - QtUtils::InstallKeyboardBlocker(this, this, &MappingButton::ConfigChanged); -} - void MappingButton::mouseReleaseEvent(QMouseEvent* event) { switch (event->button()) |
