summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorPokechu22 <Pokechu022@gmail.com>2019-05-08 17:04:46 -0700
committerPokechu22 <Pokechu022@gmail.com>2019-05-10 11:27:36 -0700
commit7c80fcde53d852c05e91ab7b130f78bdabd12f83 (patch)
treef4f54208007ac85c5e70c03b600d77961c16bc4c /Source/Core
parente7bc86881d7fd42900aaeedaff7c8b1d24d3cd55 (diff)
Allow interacting with the render window while configuring controllers
WindowModal allows alt+tabing to the render window, but prohibits interaction with parent windows (controller settings window and the main dolphin window).
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinQt/Config/ControllersWindow.cpp10
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()