ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8088 from Pokechu22/modal-control-mapping 

Allow interacting with the render window while configuring controllers
This commit is contained in:
Léo Lam 2019-05-11 10:45:28 +02:00 committed by GitHub
parent e35ccd5a9a 7c80fcde53
commit 57743637de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinQt/Config/ControllersWindow.cpp
View File

@ -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()