aboutsummaryrefslogtreecommitdiff
path: root/launcher/Application.h
diff options
context:
space:
mode:
authorRyan Cao <70191398+ryanccn@users.noreply.github.com>2022-05-24 13:35:01 +0800
committerRyan Cao <70191398+ryanccn@users.noreply.github.com>2022-05-24 13:35:01 +0800
commit0426149580feaca188c7f34b268411ffeb8787b0 (patch)
treeeef486f1360edfdae2a521f88ff711838a98e22e /launcher/Application.h
parentdca4ea5ceaa30f1285570d2bf32ea112118b9204 (diff)
downloadPrismLauncher-0426149580feaca188c7f34b268411ffeb8787b0.tar.gz
PrismLauncher-0426149580feaca188c7f34b268411ffeb8787b0.tar.bz2
PrismLauncher-0426149580feaca188c7f34b268411ffeb8787b0.zip
standard macOS app behavior
Diffstat (limited to 'launcher/Application.h')
-rw-r--r--launcher/Application.h7
1 files changed, 7 insertions, 0 deletions
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;