mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-11-22 02:32:29 +01:00
Fix window fullscreening
Cleanup
This commit is contained in:
parent
dabb814dd1
commit
63caa6f3b2
@ -100,6 +100,7 @@ MainWindow::MainWindow(int i, QString projectPath, QString id, QString decoder,
|
||||
|
||||
if (!foundWorker) {
|
||||
qDebug() << "No worker window found";
|
||||
destroyThis();
|
||||
}
|
||||
|
||||
//Hide first to avoid flickering
|
||||
@ -127,7 +128,7 @@ MainWindow::MainWindow(int i, QString projectPath, QString id, QString decoder,
|
||||
|
||||
connect(m_quickRenderer.data(), &QQuickView::statusChanged, [=](QQuickView::Status status) {
|
||||
if (status == QQuickView::Error) {
|
||||
QApplication::exit(-16);
|
||||
destroyThis();
|
||||
}
|
||||
});
|
||||
|
||||
@ -136,10 +137,20 @@ MainWindow::MainWindow(int i, QString projectPath, QString id, QString decoder,
|
||||
void MainWindow::init()
|
||||
{
|
||||
#ifdef Q_OS_WIN
|
||||
ShowWindow(m_hwnd, SW_SHOWDEFAULT);
|
||||
// This needs to be set in this order or
|
||||
// the window will be opened as fullscreen!
|
||||
ShowWindow(m_worker_hwnd, SW_SHOWDEFAULT);
|
||||
ShowWindow(m_hwnd, SW_SHOWDEFAULT);
|
||||
#endif
|
||||
}
|
||||
void MainWindow::destroyThis()
|
||||
{
|
||||
#ifdef Q_OS_WIN
|
||||
ShowWindow(m_worker_hwnd, SW_HIDE);
|
||||
ShowWindow(m_hwnd, SW_HIDE);
|
||||
#endif
|
||||
QCoreApplication::quit();
|
||||
}
|
||||
|
||||
void MainWindow::messageReceived(QString key, QString value)
|
||||
{
|
||||
@ -194,12 +205,3 @@ void MainWindow::messageReceived(QString key, QString value)
|
||||
|
||||
emit qmlSceneValueReceived(key, value);
|
||||
}
|
||||
|
||||
void MainWindow::destroyThis()
|
||||
{
|
||||
#ifdef Q_OS_WIN
|
||||
ShowWindow(m_worker_hwnd, SW_HIDE);
|
||||
ShowWindow(m_hwnd, SW_HIDE);
|
||||
#endif
|
||||
QCoreApplication::quit();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user