Skip to content

fix: show loading page before delayed archive loading on Wayland #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
May 8, 2026
Merged

fix: show loading page before delayed archive loading on Wayland #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,17 @@ 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()))) {
dbus.registerObject("/"+QString::number(QGuiApplication::applicationPid()), &app);
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();

Expand Down
8 changes: 5 additions & 3 deletions src/source/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand Down
3 changes: 3 additions & 0 deletions src/source/mainwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ public :
explicit MainWindow(QWidget *parent = nullptr);
~MainWindow() override;

void setDelayQueryDialog(bool delay) { m_bDelayQueryDialog = delay; }

/**
* @brief checkHerePath 检查目标路径是否可写/可执行
* @param strPath 全路径
Expand Down Expand Up @@ -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__
Expand Down
Loading