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
commit 57743637de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

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