diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2025-02-07 00:36:52 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2025-02-15 14:15:51 -0600 |
| commit | 66624abb124b2b1aa0fc7381d14402014ef86f66 (patch) | |
| tree | a4891e0b75f4ed1bac9be690f7883dc57f17d8f5 /Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp | |
| parent | 3189de6c7af808f62f622c744832b051f0f885ff (diff) | |
DolphinQt/Mapping: Clear and skip "Modifier" iterative input mappings when using
analog inputs.
Diffstat (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp | 59 |
1 files changed, 42 insertions, 17 deletions
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp index 54a0db59ef..d94502b104 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp @@ -25,6 +25,11 @@ constexpr auto INPUT_DETECT_MAXIMUM_TIME = std::chrono::seconds(5); // Ignore the mouse-click when queuing more buttons with "alternate mappings" enabled. constexpr auto INPUT_DETECT_ENDING_IGNORE_TIME = std::chrono::milliseconds(50); +bool ContainsAnalogInput(const ciface::Core::InputDetector::Results& results) +{ + return std::ranges::any_of(results, [](auto& detection) { return detection.smoothness > 1; }); +} + class MappingProcessor : public QWidget { public: @@ -75,24 +80,40 @@ public: m_input_detector->Update(INPUT_DETECT_INITIAL_TIME, confirmation_time, INPUT_DETECT_MAXIMUM_TIME); - if (m_input_detector->IsComplete()) + if (!m_input_detector->IsComplete()) + return; + + auto* const button = m_clicked_mapping_buttons.front(); + + auto results = m_input_detector->TakeResults(); + if (!FinalizeMapping(&results)) { - auto* const button = m_clicked_mapping_buttons.back(); + // No inputs detected. Cancel this and any other queued mappings. + CancelMapping(); + } + else if (m_parent->IsIterativeMappingEnabled() && m_clicked_mapping_buttons.empty()) + { + button->QueueNextButtonMapping(); - if (!FinalizeMapping(m_input_detector->TakeResults())) - { - // No inputs detected. Cancel this and any other queued mappings. - CancelMapping(); - } - else if (m_parent->IsIterativeMappingEnabled() && m_clicked_mapping_buttons.empty()) + if (m_clicked_mapping_buttons.empty()) + return; + + // Skip "Modifier" mappings when using analog inputs. + auto* next_button = m_clicked_mapping_buttons.front(); + if (next_button->GetControlType() == MappingButton::ControlType::ModifierInput && + ContainsAnalogInput(results)) { - button->QueueNextButtonMapping(); + // Clear "Modifier" mapping and queue the next button. + SetButtonExpression(next_button, ""); + UnQueueInputDetection(next_button); + next_button->QueueNextButtonMapping(); } } } - bool FinalizeMapping(ciface::Core::InputDetector::Results detections) + bool FinalizeMapping(ciface::Core::InputDetector::Results* detections_ptr) { + auto& detections = *detections_ptr; if (!ciface::MappingCommon::ContainsCompleteDetection(detections)) return false; @@ -100,16 +121,20 @@ public: const auto& default_device = m_parent->GetController()->GetDefaultDevice(); auto& button = m_clicked_mapping_buttons.front(); - auto* const control_reference = button->GetControlReference(); + SetButtonExpression( + button, BuildExpression(detections, default_device, ciface::MappingCommon::Quote::On)); - control_reference->SetExpression( - BuildExpression(detections, default_device, ciface::MappingCommon::Quote::On)); - m_parent->Save(); + UnQueueInputDetection(button); + return true; + } + void SetButtonExpression(MappingButton* button, const std::string& expression) + { + auto* const control_reference = button->GetControlReference(); + control_reference->SetExpression(expression); + m_parent->Save(); m_parent->GetController()->UpdateSingleControlReference(g_controller_interface, control_reference); - UnQueueInputDetection(button); - return true; } void UpdateInputDetectionStartTimer() @@ -146,7 +171,7 @@ public: auto results = m_input_detector->TakeResults(); ciface::MappingCommon::RemoveDetectionsAfterTimePoint( &results, ciface::Core::DeviceContainer::Clock::now() - INPUT_DETECT_ENDING_IGNORE_TIME); - FinalizeMapping(std::move(results)); + FinalizeMapping(&results); } UpdateInputDetectionStartTimer(); } |
