Merge pull request #1952 from PrismLauncher/backport-1947-to-release-8.x

[Backport release-8.x] fix: Minimized windows dont get shown
This commit is contained in:
Alexandru Ionut Tripon 2023-12-13 20:31:31 +02:00 committed by GitHub
commit c216713844
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1511,6 +1511,17 @@ InstanceWindow* Application::showInstanceWindow(InstancePtr instance, QString pa
auto& window = extras.window;
if (window) {
// If the window is minimized on macOS or Windows, activate and bring it up
#ifdef Q_OS_MACOS
if (window->isMinimized()) {
window->setWindowState(window->windowState() & ~Qt::WindowMinimized);
}
#elif defined(Q_OS_WIN)
if (window->isMinimized()) {
window->showNormal();
}
#endif
window->raise();
window->activateWindow();
} else {
@ -1518,6 +1529,7 @@ InstanceWindow* Application::showInstanceWindow(InstancePtr instance, QString pa
m_openWindows++;
connect(window, &InstanceWindow::isClosing, this, &Application::on_windowClose);
}
if (!page.isEmpty()) {
window->selectPage(page);
}