From d0cb62cb62ec95c47adfdca2017f48b00bbe0be5 Mon Sep 17 00:00:00 2001
From: theMackabu <theMackabu@gmail.com>
Date: Tue, 12 Dec 2023 13:18:12 -0800
Subject: [PATCH] #1945 resolve minimized windows pull from dock

Signed-off-by: theMackabu <theMackabu@gmail.com>
(cherry picked from commit 3567369d44c6ba9a3b702caf2db18b126f1b4fc4)
---
 .gitignore               |  3 +++
 launcher/Application.cpp |  8 ++++++++
 maidfile.toml            | 13 +++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 maidfile.toml

diff --git a/.gitignore b/.gitignore
index b5523f685..9f69e985c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,6 @@ flatbuild
 
 # Snap
 *.snap
+
+# maid build
+.maid
\ No newline at end of file
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index cfede9dc1..464087bd9 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1511,6 +1511,13 @@ InstanceWindow* Application::showInstanceWindow(InstancePtr instance, QString pa
     auto& window = extras.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->activateWindow();
     } else {
@@ -1518,6 +1525,7 @@ InstanceWindow* Application::showInstanceWindow(InstancePtr instance, QString pa
         m_openWindows++;
         connect(window, &InstanceWindow::isClosing, this, &Application::on_windowClose);
     }
+
     if (!page.isEmpty()) {
         window->selectPage(page);
     }
diff --git a/maidfile.toml b/maidfile.toml
new file mode 100644
index 000000000..fbd76b2e7
--- /dev/null
+++ b/maidfile.toml
@@ -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 .."