Merge pull request #632 from ryanccn/macos-app-heuristic
This commit is contained in:
parent
4f8915da6c
commit
7145a55f83
@ -871,6 +871,12 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
|
|||||||
m_mcedit.reset(new MCEditTool(m_settings));
|
m_mcedit.reset(new MCEditTool(m_settings));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef Q_OS_MACOS
|
||||||
|
connect(this, &Application::clickedOnDock, [this]() {
|
||||||
|
this->showMainWindow();
|
||||||
|
});
|
||||||
|
#endif
|
||||||
|
|
||||||
connect(this, &Application::aboutToQuit, [this](){
|
connect(this, &Application::aboutToQuit, [this](){
|
||||||
if(m_instances)
|
if(m_instances)
|
||||||
{
|
{
|
||||||
@ -954,6 +960,21 @@ bool Application::createSetupWizard()
|
|||||||
return false;
|
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)
|
void Application::setupWizardFinished(int status)
|
||||||
{
|
{
|
||||||
qDebug() << "Wizard result =" << status;
|
qDebug() << "Wizard result =" << status;
|
||||||
|
@ -94,6 +94,8 @@ public:
|
|||||||
Application(int &argc, char **argv);
|
Application(int &argc, char **argv);
|
||||||
virtual ~Application();
|
virtual ~Application();
|
||||||
|
|
||||||
|
bool event(QEvent* event) override;
|
||||||
|
|
||||||
std::shared_ptr<SettingsObject> settings() const {
|
std::shared_ptr<SettingsObject> settings() const {
|
||||||
return m_settings;
|
return m_settings;
|
||||||
}
|
}
|
||||||
@ -181,6 +183,10 @@ signals:
|
|||||||
void globalSettingsAboutToOpen();
|
void globalSettingsAboutToOpen();
|
||||||
void globalSettingsClosed();
|
void globalSettingsClosed();
|
||||||
|
|
||||||
|
#ifdef Q_OS_MACOS
|
||||||
|
void clickedOnDock();
|
||||||
|
#endif
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
bool launch(
|
bool launch(
|
||||||
InstancePtr instance,
|
InstancePtr instance,
|
||||||
@ -238,6 +244,10 @@ private:
|
|||||||
QString m_rootPath;
|
QString m_rootPath;
|
||||||
Status m_status = Application::StartingUp;
|
Status m_status = Application::StartingUp;
|
||||||
|
|
||||||
|
#ifdef Q_OS_MACOS
|
||||||
|
Qt::ApplicationState m_prevAppState = Qt::ApplicationInactive;
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined Q_OS_WIN32
|
#if defined Q_OS_WIN32
|
||||||
// used on Windows to attach the standard IO streams
|
// used on Windows to attach the standard IO streams
|
||||||
bool consoleAttached = false;
|
bool consoleAttached = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user