ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

#1945 resolve minimized windows pull from dock

Browse Source 
Signed-off-by: theMackabu <theMackabu@gmail.com>
(cherry picked from commit 3567369d44)
This commit is contained in:
theMackabu 2023-12-12 13:18:12 -08:00 committed by github-actions[bot]
parent 743d48744a
commit d0cb62cb62
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -56,3 +56,6 @@ flatbuild
# Snap # Snap
*.snap *.snap
# maid build
.maid

8
launcher/Application.cpp
View File

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

13
maidfile.toml Normal file
View File

@ -0,0 +1,13 @@
[project]
name = "Prism"
version = "8.0"
[tasks]
run = { script = "./build/prismlauncher.app/Contents/MacOS/prismlauncher" }
clean = { script = ["rm -rf build", "mkdir build"] }
build = { script = ["maid init -q", "bash -c 'cd build && ninja'"] }
[tasks.init]
depends = ["clean"]
path = "build"
script = "cmake -G Ninja -DCMAKE_INSTALL_PREFIX=install -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH='/opt/homebrew/opt/qt' -DQt6_DIR='/opt/homebrew/opt/qt' -DLauncher_BUILD_PLATFORM=macOS -DENABLE_LTO=ON .."