diff options
| author | Léo Lam <leo@leolam.fr> | 2019-05-11 10:45:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-11 10:45:28 +0200 |
| commit | 57743637de72303343b3f5d31a9cc10a2730d007 (patch) | |
| tree | 756f54876788e8f64e17efda7038a0c08eadfcfe /Source/Core/DolphinQt/Config/ControllersWindow.cpp | |
| parent | e35ccd5a9aada7c5f1a9563ac20f1650977bcedd (diff) | |
| parent | 7c80fcde53d852c05e91ab7b130f78bdabd12f83 (diff) | |
Merge pull request #8088 from Pokechu22/modal-control-mapping
Allow interacting with the render window while configuring controllers
Diffstat (limited to 'Source/Core/DolphinQt/Config/ControllersWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/ControllersWindow.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt/Config/ControllersWindow.cpp b/Source/Core/DolphinQt/Config/ControllersWindow.cpp index fb5813bdc1..3eeec77e0f 100644 --- a/Source/Core/DolphinQt/Config/ControllersWindow.cpp +++ b/Source/Core/DolphinQt/Config/ControllersWindow.cpp @@ -426,7 +426,10 @@ void ControllersWindow::OnGCPadConfigure() return; } - MappingWindow(this, type, static_cast<int>(index)).exec(); + MappingWindow* window = new MappingWindow(this, type, static_cast<int>(index)); + window->setAttribute(Qt::WA_DeleteOnClose, true); + window->setWindowModality(Qt::WindowModality::WindowModal); + window->show(); } void ControllersWindow::OnWiimoteConfigure() @@ -451,7 +454,10 @@ void ControllersWindow::OnWiimoteConfigure() return; } - MappingWindow(this, type, static_cast<int>(index)).exec(); + MappingWindow* window = new MappingWindow(this, type, static_cast<int>(index)); + window->setAttribute(Qt::WA_DeleteOnClose, true); + window->setWindowModality(Qt::WindowModality::WindowModal); + window->show(); } void ControllersWindow::LoadSettings() |