From 0426149580feaca188c7f34b268411ffeb8787b0 Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Tue, 24 May 2022 13:35:01 +0800
Subject: standard macOS app behavior

---
 launcher/Application.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'launcher/Application.h')

diff --git a/launcher/Application.h b/launcher/Application.h
index 3129b4fb..d6a5473d 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;
     }
@@ -180,6 +182,7 @@ signals:
     void updateAllowedChanged(bool status);
     void globalSettingsAboutToOpen();
     void globalSettingsClosed();
+    void clickedOnDock();
 
 public slots:
     bool launch(
@@ -238,6 +241,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;
-- 
cgit 


From 9673dac22b0ff81a54847d5db5438c099a6df587 Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Tue, 24 May 2022 16:18:02 +0800
Subject: add more `#ifdef`s

---
 launcher/Application.cpp | 2 ++
 launcher/Application.h   | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'launcher/Application.h')

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index bcfdc460..ff0f2129 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -871,9 +871,11 @@ 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)
diff --git a/launcher/Application.h b/launcher/Application.h
index d6a5473d..686137ec 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -182,7 +182,10 @@ signals:
     void updateAllowedChanged(bool status);
     void globalSettingsAboutToOpen();
     void globalSettingsClosed();
+
+#ifdef Q_OS_MACOS
     void clickedOnDock();
+#endif
 
 public slots:
     bool launch(
-- 
cgit