diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2024-11-02 02:52:18 -0500 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2025-01-01 16:48:32 -0600 |
| commit | f12846a0e93ea9ad69f884fb850cce379bc5bed0 (patch) | |
| tree | ee796020be484516691e0c7561a27e70ff56bd53 /Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp | |
| parent | bc95c001c81a215ebde6a4c8b151b89f488f822b (diff) | |
DolphinQt: Make input mapping and output testing non-blocking.
Diffstat (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp index ae4095a82c..30f0e41e86 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp @@ -20,7 +20,6 @@ #include "DolphinQt/Config/Mapping/MappingWindow.h" #include "DolphinQt/QtUtils/SetWindowDecorations.h" -#include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/Control/Control.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h" @@ -340,10 +339,10 @@ MappingWidget::CreateSettingAdvancedMappingButton(ControllerEmu::NumericSettingB setting.SetExpressionFromValue(); // Ensure the UI has the game-controller indicator while editing the expression. + // And cancel in-progress mappings. ConfigChanged(); - IOWindow io(this, GetController(), &setting.GetInputReference(), IOWindow::Type::Input); - SetQWidgetWindowDecorations(&io); + IOWindow io(GetParent(), GetController(), &setting.GetInputReference(), IOWindow::Type::Input); io.exec(); setting.SimplifyIfPossible(); |