Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[macOS,Windows] Fix hidden minimized windows #1947

Merged
merged 5 commits into from
Dec 13, 2023
Merged

[macOS,Windows] Fix hidden minimized windows #1947

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3567369
#1945 resolve minimized windows pull from dock
theMackabu Dec 12, 2023
836f74c
#1945 resolve issue on windows
theMackabu Dec 12, 2023
201c978
clang-format: fix formatting
theMackabu Dec 12, 2023
7c33a8e
remove: maidfile.toml (local build tool)
theMackabu Dec 12, 2023
2391ad2
Revert change to .gitignore
TheKodeToad Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions launcher/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1513,13 +1513,25 @@ 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 {
window = new InstanceWindow(instance);
m_openWindows++;
connect(window, &InstanceWindow::isClosing, this, &Application::on_windowClose);
}

if (!page.isEmpty()) {
window->selectPage(page);
}
Expand Down