From bbe8c9e8ab5b4b2f7390e99393cc10005ebbcd2d Mon Sep 17 00:00:00 2001
From: ZhangTingan <ZhangTingan@uniontech.com>
Date: Fri, 8 May 2026 10:27:47 +0800
Subject: [PATCH] fix: delay archive loading for non-first instance on Wayland

On Wayland, the window position is set by the compositor for
non-first instances. Previously the archive loading was delayed
unconditionally on Wayland, causing the home page to flash.
Now only non-first instances delay loading, and show the loading
animation before the delay to avoid flashing.

Bug: https://pms.uniontech.com/bug-view-359077.html
---
 src/main.cpp              | 4 ++++
 src/source/mainwindow.cpp | 8 +++++---
 src/source/mainwindow.h   | 3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index d49978412..878f8bf59 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -205,6 +205,8 @@ int main(int argc, char *argv[])
     if(!orderObject){
         if (dbus.registerService("com.deepin.compressor")) {
             Dtk::Widget::moveToCenter(&w);
+        } else if (UiTools::isWayland()) { // Wayland下非首个实例，弹窗需延迟等窗管设置位置
+            w.setDelayQueryDialog(true);
         }
     } else {
         if (dbus.registerService("com.deepin.compressor"+QString::number(QGuiApplication::applicationPid()))) {
@@ -212,6 +214,8 @@ int main(int argc, char *argv[])
              adaptor.setCompressFile(newfilelist.first());
              Dtk::Widget::moveToCenter(&w);
              w.setProperty(ORDER_JSON, sJsonStr);
+        } else if (UiTools::isWayland()) { // Wayland下非首个实例，弹窗需延迟等窗管设置位置
+            w.setDelayQueryDialog(true);
         }
         QDBusConnection dbusConnection = QDBusConnection::sessionBus();
 
diff --git a/src/source/mainwindow.cpp b/src/source/mainwindow.cpp
index ae7f60f01..2909e8a3f 100644
--- a/src/source/mainwindow.cpp
+++ b/src/source/mainwindow.cpp
@@ -2591,10 +2591,12 @@ bool MainWindow::handleArguments_Open(const QStringList &listParam)
     qInfo() << "打开文件";
     m_eStartupType = StartupType::ST_Normal;
     // 加载单个压缩包数据
-    static bool firstLoad = true;
-    if (UiTools::isWayland() && firstLoad) {
-        firstLoad = false;
+    if (m_bDelayQueryDialog) {
+        m_bDelayQueryDialog = false;
         auto path = listParam[0];
+        m_ePageID = PI_Loading;
+        m_pLoadingPage->setDes(tr("Loading, please wait..."));
+        m_pLoadingPage->startLoading();
         QTimer::singleShot(200, [this, path]() {
             loadArchive(path);
         });
diff --git a/src/source/mainwindow.h b/src/source/mainwindow.h
index ba51e5371..9aa7f2a05 100644
--- a/src/source/mainwindow.h
+++ b/src/source/mainwindow.h
@@ -55,6 +55,8 @@ public :
     explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow() override;
 
+    void setDelayQueryDialog(bool delay) { m_bDelayQueryDialog = delay; }
+
     /**
      * @brief checkHerePath 检查目标路径是否可写/可执行
      * @param strPath       全路径
@@ -586,6 +588,7 @@ private Q_SLOTS:
     QString m_fileWriteErrorName;     // 创建失败的文件名
 
     StartupType m_eStartupType = StartupType::ST_Normal;      // 操作方式
+    bool m_bDelayQueryDialog = false;
     CalculateSizeThread *m_mywork = nullptr; // 计算文件(夹)大小线程
     // 适配arm平台
 #ifdef __aarch64__