From 581c1bc54f07d98e0d8b73896ef074053aa27dc0 Mon Sep 17 00:00:00 2001 From: caixiangrong Date: Sun, 20 Sep 2026 12:23:14 +0800 Subject: [PATCH] fix(display): sync Treeland wallpaper previews MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Add an in-process WallpaperSync singleton shared by the display and personalization plugins 2. Publish desktop wallpaper source, monitor name, and source type after a successful Treeland wallpaper update 3. Apply synced wallpapers by monitor name and reuse video thumbnail resolution for video wallpapers 4. Rebind Treeland Wallpaper contexts when the display page is activated so the compositor can push its initial state 5. Keep the X11 DBus wallpaper refresh path unchanged Log: Treeland display wallpaper previews now update immediately Influence: Treeland wallpaper preview updates no longer require restarting the control center; X11 wallpaper preview behavior is unchanged fix(display): 同步 Treeland 壁纸示意图 1. 新增显示与个性化插件共享的同进程 WallpaperSync 单例 2. Treeland 桌面壁纸设置成功后发布壁纸源、显示器名称和源类型 3. 按显示器名称应用同步壁纸，视频壁纸复用缩略图解析逻辑 4. 显示页面激活时重新绑定 Treeland Wallpaper 对象，触发合成器推送初始状态 5. 保持 X11 的 DBus 壁纸刷新路径不变 Log: Treeland 显示壁纸示意图可立即更新 Influence: Treeland 壁纸示意图更新不再需要重启控制中心；X11 壁纸示意图行为不变 PMS: BUG-372289 --- src/plugin-display/CMakeLists.txt | 1 + .../operation/private/displayworker.cpp | 35 +++++++++++ .../operation/private/displayworker.h | 2 + src/plugin-personalization/CMakeLists.txt | 1 + .../operation/treelandworker.cpp | 10 ++++ src/shared-utils/CMakeLists.txt | 2 + src/shared-utils/wallpapersync.cpp | 60 +++++++++++++++++++ src/shared-utils/wallpapersync.h | 31 ++++++++++ 8 files changed, 142 insertions(+) create mode 100644 src/shared-utils/wallpapersync.cpp create mode 100644 src/shared-utils/wallpapersync.h diff --git a/src/plugin-display/CMakeLists.txt b/src/plugin-display/CMakeLists.txt index fd1403f4ee..94d04c7840 100644 --- a/src/plugin-display/CMakeLists.txt +++ b/src/plugin-display/CMakeLists.txt @@ -70,6 +70,7 @@ set(Display_Libraries ${QT_NS}::Concurrent ${DTK_NS}::Core dcc-wallpaper-utils + dcc-shared-utils ) target_link_libraries(${Display_Name} PRIVATE diff --git a/src/plugin-display/operation/private/displayworker.cpp b/src/plugin-display/operation/private/displayworker.cpp index bebae04931..fee273f835 100644 --- a/src/plugin-display/operation/private/displayworker.cpp +++ b/src/plugin-display/operation/private/displayworker.cpp @@ -5,6 +5,7 @@ #include "displaymodel.h" #include "wallpaperthumbnailutils.h" +#include "wallpapersync.h" #include #include @@ -147,6 +148,11 @@ void DisplayWorker::initTreeland() m_wallpaperMgr = new WQt::WallpaperManager(this); connect(m_wallpaperMgr, &WQt::WallpaperManager::activeChanged, this, &DisplayWorker::onWallpaperManagerActive); + if (auto *wallpaperSync = WallpaperSync::instance()) { + connect(wallpaperSync, &WallpaperSync::wallpaperChanged, + this, &DisplayWorker::onSyncedWallpaperChanged, Qt::QueuedConnection); + } + // wl_output 的生命周期由 Qt 平台插件维护，跟随 QScreen 即可 connect(qApp, &QGuiApplication::screenAdded, this, &DisplayWorker::screenAdded); connect(qApp, &QGuiApplication::screenRemoved, this, &DisplayWorker::screenRemoved); @@ -196,6 +202,9 @@ void DisplayWorker::active() // m_model->setResolutionRefreshEnable(m_dccSettings->get(GSETTINGS_SHOW_MUTILSCREEN).toBool()); // m_model->setBrightnessEnable(m_dccSettings->get(GSETTINGS_BRIGHTNESS_ENABLE).toBool()); } + else { + rebindWallpaperContexts(); + } } void DisplayWorker::saveChanges() @@ -405,6 +414,17 @@ void DisplayWorker::updateWallpaperFromWayland() ensureWallpaperContext(screen); } +void DisplayWorker::rebindWallpaperContexts() +{ + for (auto *screen : QGuiApplication::screens()) { + auto *output = m_screen_outputs.value(screen); + if (output && m_wallpaperMgr) + m_wallpaperMgr->removeWallpaper(output); + + ensureWallpaperContext(screen); + } +} + void DisplayWorker::ensureWallpaperContext(QScreen *screen) { if (!screen || !m_wallpaperMgr || !m_wallpaperMgr->isActive()) @@ -460,6 +480,21 @@ void DisplayWorker::onWallpaperChanged(const QString &fileSource, uint32_t sourc } } +void DisplayWorker::onSyncedWallpaperChanged(const QString &monitorName, const QString &source, uint sourceType) +{ + for (auto it(m_wl_monitors.cbegin()); it != m_wl_monitors.cend(); ++it) { + if (it.key()->name() != monitorName) + continue; + + QString wallpaper = source; + if (sourceType == WallpaperSync::VideoSourceType) + wallpaper = resolveVideoThumbnail(source, it.key()); + + it.key()->setWallpaper(wallpaper); + break; + } +} + void DisplayWorker::updateVirtualOutputs() { if (!m_virtualOutputMgr) diff --git a/src/plugin-display/operation/private/displayworker.h b/src/plugin-display/operation/private/displayworker.h index a582703a1d..9dc241bb1d 100644 --- a/src/plugin-display/operation/private/displayworker.h +++ b/src/plugin-display/operation/private/displayworker.h @@ -101,8 +101,10 @@ private Q_SLOTS: void updateWallpaper(); void updateMonitorWallpaper(Monitor *mon); void updateWallpaperFromWayland(); + void rebindWallpaperContexts(); void ensureWallpaperContext(QScreen *screen); void onWallpaperChanged(const QString &fileSource, uint32_t sourceType, uint32_t role); + void onSyncedWallpaperChanged(const QString &monitorName, const QString &source, uint sourceType); void updateVirtualOutputs(); void onBrightnessChanged(WQt::ColorControl *colorControl, double brightness); diff --git a/src/plugin-personalization/CMakeLists.txt b/src/plugin-personalization/CMakeLists.txt index bc3be34664..f97d8be41a 100644 --- a/src/plugin-personalization/CMakeLists.txt +++ b/src/plugin-personalization/CMakeLists.txt @@ -44,6 +44,7 @@ set(Personalization_Libraries ${QT_NS}::WaylandClientPrivate ${QT_NS}::Concurrent dcc-wallpaper-utils + dcc-shared-utils ) target_include_directories(${LIB_NAME} PUBLIC diff --git a/src/plugin-personalization/operation/treelandworker.cpp b/src/plugin-personalization/operation/treelandworker.cpp index a6c2ab4181..2e8afa918a 100644 --- a/src/plugin-personalization/operation/treelandworker.cpp +++ b/src/plugin-personalization/operation/treelandworker.cpp @@ -24,6 +24,7 @@ #include "operation/personalizationworker.h" #include "operation/model/thememodel.h" #include "operation/personalizationexport.hpp" +#include "wallpapersync.h" #define TYPEWALLPAPER "wallpaper" #define TYPEGREETERBACKGROUND "greeterbackground" @@ -450,6 +451,15 @@ bool TreeLandWorker::setWallpaper(const QString &monitorName, const QString &url } } + if (role == WallpaperContext::wallpaper_role_desktop) { + if (auto *wallpaperSync = WallpaperSync::instance()) { + QMetaObject::invokeMethod(wallpaperSync, "setWallpaper", Qt::QueuedConnection, + Q_ARG(QString, monitorName), + Q_ARG(QString, dest), + Q_ARG(uint, type)); + } + } + return true; } diff --git a/src/shared-utils/CMakeLists.txt b/src/shared-utils/CMakeLists.txt index eca1c00867..0ee2f3703b 100644 --- a/src/shared-utils/CMakeLists.txt +++ b/src/shared-utils/CMakeLists.txt @@ -20,6 +20,8 @@ set(DCC_SHARED_UTILS_SOURCES "dcclocale.cpp" "dccdsappletmanager.h" "dccdsappletmanager.cpp" + "wallpapersync.h" + "wallpapersync.cpp" ) target_sources(dcc-shared-utils PRIVATE diff --git a/src/shared-utils/wallpapersync.cpp b/src/shared-utils/wallpapersync.cpp new file mode 100644 index 0000000000..71112e5811 --- /dev/null +++ b/src/shared-utils/wallpapersync.cpp @@ -0,0 +1,60 @@ +// SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd. +// +// SPDX-License-Identifier: GPL-3.0-or-later + +#include "wallpapersync.h" + +#include +#include +#include + +namespace { +QPointer wallpaperSyncInstance; +} // namespace + +WallpaperSync *WallpaperSync::instance() +{ + if (wallpaperSyncInstance) + return wallpaperSyncInstance; + + auto *application = QCoreApplication::instance(); + if (!application) + return nullptr; + + // The lambda is defined inside this static member function, so it inherits + // WallpaperSync's access rights and may invoke the private constructor. + auto create = [application]() { + if (!wallpaperSyncInstance) + wallpaperSyncInstance = new WallpaperSync(application); + }; + + if (QThread::currentThread() == application->thread()) { + create(); + } else { + QMetaObject::invokeMethod(application, create, Qt::BlockingQueuedConnection); + } + + return wallpaperSyncInstance; +} + +QVariantMap WallpaperSync::wallpaperMap() const +{ + return m_wallpaperMap; +} + +void WallpaperSync::setWallpaper(const QString &monitorName, const QString &source, uint sourceType) +{ + const QVariantMap wallpaper{ { QStringLiteral("source"), source }, + { QStringLiteral("sourceType"), sourceType } }; + + if (m_wallpaperMap.value(monitorName) == wallpaper) + return; + + m_wallpaperMap.insert(monitorName, wallpaper); + Q_EMIT wallpaperChanged(monitorName, source, sourceType); +} + +WallpaperSync::WallpaperSync(QObject *parent) + : QObject(parent) +{ +} diff --git a/src/shared-utils/wallpapersync.h b/src/shared-utils/wallpapersync.h new file mode 100644 index 0000000000..48cf3f0173 --- /dev/null +++ b/src/shared-utils/wallpapersync.h @@ -0,0 +1,31 @@ +// SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd. +// +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include +#include + +class WallpaperSync : public QObject +{ + Q_OBJECT +public: + static constexpr uint ImageSourceType = 0; + static constexpr uint VideoSourceType = 1; + + static WallpaperSync *instance(); + + QVariantMap wallpaperMap() const; + +public Q_SLOTS: + void setWallpaper(const QString &monitorName, const QString &source, uint sourceType); + +Q_SIGNALS: + void wallpaperChanged(const QString &monitorName, const QString &source, uint sourceType); + +private: + explicit WallpaperSync(QObject *parent = nullptr); + + QVariantMap m_wallpaperMap; +};