Fix bugs of detecting window exposed

CrSjimo · CrSjimo · commit be04e2d9ed4e · 2025-10-02T04:16:15.000+08:00
diff --git a/src/plugins/coreplugin/core/coreinterface.cpp b/src/plugins/coreplugin/core/coreinterface.cpp
@@ -222,20 +222,34 @@ namespace Core {
         Q_UNUSED(windowInterface);
     }
 
-    QQuickWindow *CoreInterface::newFile() {
+    ProjectWindowInterface *CoreInterface::newFile() {
         qCInfo(lcCoreInterface) << "New file";
         Internal::ProjectStartupTimerAddOn::startTimer();
         // TODO: temporarily creates a project window for testing
-        auto win = static_cast<QQuickWindow *>(ProjectWindowInterfaceRegistry::instance()->create()->window());
+        auto windowInterface = ProjectWindowInterfaceRegistry::instance()->create();
+        auto win = static_cast<QQuickWindow *>(windowInterface->window());
         win->show();
         if (HomeWindowInterface::instance() && (Internal::BehaviorPreference::startupBehavior() & Internal::BehaviorPreference::SB_CloseHomeWindowAfterOpeningProject)) {
             qCInfo(lcCoreInterface) << "Closing home window";
             HomeWindowInterface::instance()->quit();
         }
-        connect(win, &QQuickWindow::sceneGraphInitialized, [] {
-            Internal::CoreAchievementsModel::triggerAchievementCompleted(Internal::CoreAchievementsModel::Achievement_NewProject);
-        });
-        return win;
+        class ExposedListener : public QObject {
+        public:
+            explicit ExposedListener(QObject *parent) : QObject(parent) {
+            }
+
+            bool eventFilter(QObject *watched, QEvent *event) override {
+                if (event->type() == QEvent::Expose && static_cast<QWindow *>(watched)->isExposed()) {
+                    Internal::CoreAchievementsModel::triggerAchievementCompleted(Internal::CoreAchievementsModel::Achievement_NewProject);
+                    deleteLater();
+                }
+                return QObject::eventFilter(watched, event);
+            }
+
+        };
+        auto listener = new ExposedListener(win);
+        win->installEventFilter(listener);
+        return windowInterface;
     }
 
     bool CoreInterface::openFile(const QString &fileName, QWidget *parent) {
diff --git a/src/plugins/coreplugin/core/coreinterface.h b/src/plugins/coreplugin/core/coreinterface.h
@@ -13,14 +13,15 @@
 
 class QQmlEngine;
 class QJSEngine;
-class QQuickWindow;
 
 namespace Core {
 
     namespace Internal {
         class CorePlugin;
     }
 
+    class ProjectWindowInterface;
+
     class CoreInterfacePrivate;
 
     class CORE_EXPORT CoreInterface : public CoreInterfaceBase {
@@ -42,7 +43,7 @@ namespace Core {
         Q_INVOKABLE static void showHome();
 
     public:
-        Q_INVOKABLE static QQuickWindow *newFile();
+        Q_INVOKABLE static ProjectWindowInterface *newFile();
         static bool openFile(const QString &fileName, QWidget *parent = nullptr);
 
     Q_SIGNALS:
diff --git a/src/plugins/coreplugin/internal/addon/projectstartuptimeraddon.cpp b/src/plugins/coreplugin/internal/addon/projectstartuptimeraddon.cpp
@@ -43,31 +43,8 @@ namespace Core::Internal {
     
     void ProjectStartupTimerAddOn::extensionsInitialized() {
         auto windowInterface = windowHandle()->cast<ProjectWindowInterface>();
-        auto window = qobject_cast<QQuickWindow *>(windowInterface->window());
-        Q_ASSERT(window);
-        connect(window, &QQuickWindow::sceneGraphInitialized, this, [=] {
-            QTimer::singleShot(0, [=] {
-                m_finishedMessage = new NotificationMessage(windowInterface->window());
-                m_finishedMessage->setIcon(SVS::SVSCraft::Success);
-                auto elapsedTime = stopTimerAndGetElapsedTime();
-                if (elapsedTime != -1) {
-                    double second = elapsedTime / 1000.0;
-                    m_finishedMessage->setTitle(tr("Project window initialized in %1 seconds").arg(second, 0, 'f', 3));
-                } else {
-                    m_finishedMessage->setTitle(tr("Project window initialized"));
-                }
-                m_finishedMessage->setAllowDoNotShowAgain(notificationVisible());
-                connect(m_finishedMessage, &NotificationMessage::doNotShowAgainRequested, this, [=] {
-                    setNotificationVisible(false);
-                    m_finishedMessage->setAllowDoNotShowAgain(false);
-                });
-                windowInterface->sendNotification(m_finishedMessage, notificationVisible() ? ProjectWindowInterface::AutoHide : ProjectWindowInterface::DoNotShowBubble);
-                m_initializingMessage->close();
-                if (elapsedTime > 60000) {
-                    CoreAchievementsModel::triggerAchievementCompleted(CoreAchievementsModel::Achievement_KeepPatient);
-                }
-            });
-        });
+        auto window = windowInterface->window();
+        window->installEventFilter(this);
     }
     
     bool ProjectStartupTimerAddOn::delayedInitialize() {
@@ -105,4 +82,33 @@ namespace Core::Internal {
         settings->endGroup();
         return visible;
     }
+    bool ProjectStartupTimerAddOn::eventFilter(QObject *watched, QEvent *event) {
+        auto windowInterface = windowHandle()->cast<ProjectWindowInterface>();
+        auto window = windowInterface->window();
+        if (event->type() == QEvent::Expose && window->isExposed()) {
+            QTimer::singleShot(0, [=] {
+                m_finishedMessage = new NotificationMessage(windowInterface->window());
+                m_finishedMessage->setIcon(SVS::SVSCraft::Success);
+                auto elapsedTime = stopTimerAndGetElapsedTime();
+                if (elapsedTime != -1) {
+                    double second = elapsedTime / 1000.0;
+                    m_finishedMessage->setTitle(tr("Project window initialized in %1 seconds").arg(second, 0, 'f', 3));
+                } else {
+                    m_finishedMessage->setTitle(tr("Project window initialized"));
+                }
+                m_finishedMessage->setAllowDoNotShowAgain(notificationVisible());
+                connect(m_finishedMessage, &NotificationMessage::doNotShowAgainRequested, this, [=] {
+                    setNotificationVisible(false);
+                    m_finishedMessage->setAllowDoNotShowAgain(false);
+                });
+                windowInterface->sendNotification(m_finishedMessage, notificationVisible() ? ProjectWindowInterface::AutoHide : ProjectWindowInterface::DoNotShowBubble);
+                m_initializingMessage->close();
+                if (elapsedTime > 60000) {
+                    CoreAchievementsModel::triggerAchievementCompleted(CoreAchievementsModel::Achievement_KeepPatient);
+                }
+            });
+            window->removeEventFilter(this);
+        }
+        return WindowInterfaceAddOn::eventFilter(watched, event);
+    }
 }
diff --git a/src/plugins/coreplugin/internal/addon/projectstartuptimeraddon.h b/src/plugins/coreplugin/internal/addon/projectstartuptimeraddon.h
@@ -25,6 +25,8 @@ namespace Core::Internal {
         static void setNotificationVisible(bool visible);
         static bool notificationVisible();
 
+        bool eventFilter(QObject *watched, QEvent *event) override;
+
     private:
         NotificationMessage *m_initializingMessage{};
         NotificationMessage *m_finishedMessage{};
diff --git a/src/plugins/coreplugin/internal/addon/workspaceaddon.cpp b/src/plugins/coreplugin/internal/addon/workspaceaddon.cpp
@@ -62,6 +62,7 @@ namespace Core::Internal {
         }
     }
     void WorkspaceAddOn::extensionsInitialized() {
+        windowHandle()->window()->installEventFilter(this);
     }
     bool WorkspaceAddOn::delayedInitialize() {
         emit panelEntriesChanged();
@@ -274,9 +275,7 @@ namespace Core::Internal {
     QVariantList WorkspaceAddOn::panelEntries() const {
         QVariantList ret;
         auto windowInterface = windowHandle()->cast<ProjectWindowInterface>();
-        auto a = CoreInterface::actionRegistry()->catalog().children("core.workspacePanelWidgets") | std::views::filter([=](const QString &id) -> bool {
-            return windowInterface->actionContext()->action(id);
-        });
+        auto a = CoreInterface::actionRegistry()->catalog().children("core.workspacePanelWidgets") | std::views::filter([=](const QString &id) -> bool { return windowInterface->actionContext()->action(id); });
         std::ranges::transform(a, std::back_inserter(ret), [](const QString &id) {
             auto info = CoreInterface::actionRegistry()->actionInfo(id);
             auto actionIcon = CoreInterface::actionRegistry()->actionIcon("", info.id());
@@ -290,6 +289,13 @@ namespace Core::Internal {
         });
         return ret;
     }
+    bool WorkspaceAddOn::eventFilter(QObject *watched, QEvent *event) {
+        if (event->type() == QEvent::Expose && windowHandle()->window()->isExposed()) {
+            Q_EMIT windowExposed();
+            windowHandle()->window()->removeEventFilter(this);
+        }
+        return WindowInterfaceAddOn::eventFilter(watched, event);
+    }
 }
 
 #include "moc_workspaceaddon.cpp"
diff --git a/src/plugins/coreplugin/internal/addon/workspaceaddon.h b/src/plugins/coreplugin/internal/addon/workspaceaddon.h
@@ -32,8 +32,11 @@ namespace Core::Internal {
 
         QVariantList panelEntries() const;
 
+        bool eventFilter(QObject *watched, QEvent *event) override;
+
     Q_SIGNALS:
         void panelEntriesChanged();
+        void windowExposed();
 
     private:
         ProjectWindowWorkspaceManager *m_workspaceManager;
diff --git a/src/plugins/coreplugin/internal/coreplugin.cpp b/src/plugins/coreplugin/internal/coreplugin.cpp
@@ -143,27 +143,28 @@ namespace Core::Internal {
         CoreAchievementsModel::triggerAchievementCompleted(CoreAchievementsModel::Achievement_UltimateSimplicity);
     }
 
-    static QQuickWindow *initializeGui(const QStringList &options, const QString &workingDirectory, const QStringList &args) {
+    static ActionWindowInterfaceBase *initializeGui(const QStringList &options, const QString &workingDirectory, const QStringList &args) {
         if (options.contains(kOpenSettingsArg)) {
             qCInfo(lcCorePlugin) << "Open settings dialog with command line args";
             CoreInterface::execSettingsDialog("", nullptr);
             CoreAchievementsModel::triggerAchievementCompleted(CoreAchievementsModel::Achievement_CommandLineSettings);
         }
-        QQuickWindow *win;
+        ActionWindowInterfaceBase *windowInterface;
         if (options.contains(kNewProjectArg) || (BehaviorPreference::startupBehavior() & BehaviorPreference::SB_CreateNewProject)) {
             qCInfo(lcCorePlugin) << "Create new project on startup";
-            win = CoreInterface::newFile();
+            windowInterface = CoreInterface::newFile();
         } else {
             qCInfo(lcCorePlugin) << "Open home window on startup";
             CoreInterface::showHome();
-            win = static_cast<QQuickWindow *>(HomeWindowInterface::instance()->window());
+            windowInterface = HomeWindowInterface::instance();
         }
+        auto win = windowInterface->window();
         if (win->visibility() == QWindow::Minimized) {
             win->showNormal();
         }
         win->raise();
         win->requestActivate();
-        return win;
+        return windowInterface;
     }
 
     bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage) {
@@ -201,8 +202,24 @@ namespace Core::Internal {
         qCInfo(lcCorePlugin) << "Initializing GUI";
         // TODO plugin arguments
         auto args = QApplication::arguments();
-        auto win = initializeGui(args, QDir::currentPath(), args);
-        connect(win, &QQuickWindow::sceneGraphInitialized, RuntimeInterface::splash(), &QWidget::close);
+        auto windowInterface = initializeGui(args, QDir::currentPath(), args);
+        auto win = windowInterface->window();
+        class ExposedListener : public QObject {
+        public:
+            explicit ExposedListener(QObject *parent) : QObject(parent) {
+            }
+
+            bool eventFilter(QObject *watched, QEvent *event) override {
+                if (event->type() == QEvent::Expose && static_cast<QWindow *>(watched)->isExposed()) {
+                    RuntimeInterface::splash()->close();
+                    deleteLater();
+                }
+                return QObject::eventFilter(watched, event);
+            }
+
+        };
+        auto listener = new ExposedListener(win);
+        win->installEventFilter(listener);
         CoreAchievementsModel::triggerAchievementCompleted(CoreAchievementsModel::Achievement_DiffScope);
         checkUltimateSimplicityAchievement();
         QApplication::setQuitOnLastWindowClosed(true);
diff --git a/src/plugins/coreplugin/qml/windows/WorkspaceAddOnHelper.qml b/src/plugins/coreplugin/qml/windows/WorkspaceAddOnHelper.qml
@@ -255,9 +255,9 @@ QtObject {
     }
 
     readonly property Connections windowHandleConnections: Connections {
-        target: helper.window
-        function onSceneGraphInitialized() {
-            helper.initializeDockingViews()
+        target: helper.addOn
+        function onWindowExposed() {
+            Qt.callLater(() => helper.initializeDockingViews())
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -255,9 +255,9 @@ QtObject {`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`readonly property Connections windowHandleConnections: Connections {`
`258`		`- target: helper.window`
`259`		`- function onSceneGraphInitialized() {`
`260`		`- helper.initializeDockingViews()`
	`258`	`+ target: helper.addOn`
	`259`	`+ function onWindowExposed() {`
	`260`	`+ Qt.callLater(() => helper.initializeDockingViews())`
`261`	`261`	`}`
`262`	`262`	`}`
`263`	`263`