From 7145a55f83bf91228681860f5b9925b41842b459 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 12 Jun 2022 10:46:49 +0200
Subject: [PATCH] Merge pull request #632 from ryanccn/macos-app-heuristic

---
 launcher/Application.cpp | 21 +++++++++++++++++++++
 launcher/Application.h   | 10 ++++++++++
 2 files changed, 31 insertions(+)

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index ba4096b64..dfa756d41 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -871,6 +871,12 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         m_mcedit.reset(new MCEditTool(m_settings));
     }
 
+#ifdef Q_OS_MACOS
+    connect(this, &Application::clickedOnDock, [this]() {
+        this->showMainWindow();
+    });
+#endif
+
     connect(this, &Application::aboutToQuit, [this](){
         if(m_instances)
         {
@@ -954,6 +960,21 @@ bool Application::createSetupWizard()
     return false;
 }
 
+bool Application::event(QEvent* event) {
+#ifdef Q_OS_MACOS
+    if (event->type() == QEvent::ApplicationStateChange) {
+        auto ev = static_cast<QApplicationStateChangeEvent*>(event);
+
+        if (m_prevAppState == Qt::ApplicationActive
+                && ev->applicationState() == Qt::ApplicationActive) {
+            emit clickedOnDock();
+        }
+        m_prevAppState = ev->applicationState();
+    }
+#endif
+    return QApplication::event(event);
+}
+
 void Application::setupWizardFinished(int status)
 {
     qDebug() << "Wizard result =" << status;
diff --git a/launcher/Application.h b/launcher/Application.h
index 3129b4fb8..686137ece 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -94,6 +94,8 @@ public:
     Application(int &argc, char **argv);
     virtual ~Application();
 
+    bool event(QEvent* event) override;
+
     std::shared_ptr<SettingsObject> settings() const {
         return m_settings;
     }
@@ -181,6 +183,10 @@ signals:
     void globalSettingsAboutToOpen();
     void globalSettingsClosed();
 
+#ifdef Q_OS_MACOS
+    void clickedOnDock();
+#endif
+
 public slots:
     bool launch(
         InstancePtr instance,
@@ -238,6 +244,10 @@ private:
     QString m_rootPath;
     Status m_status = Application::StartingUp;
 
+#ifdef Q_OS_MACOS
+    Qt::ApplicationState m_prevAppState = Qt::ApplicationInactive;
+#endif
+
 #if defined Q_OS_WIN32
     // used on Windows to attach the standard IO streams
     bool consoleAttached = false;