fix: Fix the issue where the launcher fullscreen background doesn't change

Fix the issue where the launcher fullscreen background doesn't change

Log: Fix the issue where the launcher fullscreen background doesn't change
pms: BUG-343521

Author: pengfeixx

launchercontroller.cpp

@@ -156,6 +156,20 @@ void LauncherController::setCurrentFrame(const QString &frame)
     emit currentFrameChanged();
 }
 
+QString LauncherController::currentScreen() const
+{
+    return m_currentScreen;
+}
+
+void LauncherController::setCurrentScreen(const QString &screen)
+{
+    if (m_currentScreen == screen) return;
+
+    m_currentScreen = screen;
+    qCInfo(logController) << "Current screen changed to:" << m_currentScreen;
+    emit currentScreenChanged();
+}
+
 // We need to hide the launcher when it lost focus, but clicking the launcher icon on the taskbar/dock will also trigger
 // `Toggle()`, which will show the launcher even if it just get hid caused by losting focus. Thus, we added a timer to
 // mark it as we just hide it, and check if the timer is running while calling `Toggle()`. This function will do nothing

launchercontroller.h

@@ -17,6 +17,7 @@ class LauncherController : public QObject
 
     Q_PROPERTY(bool visible READ visible WRITE setVisible NOTIFY visibleChanged)
     Q_PROPERTY(QString currentFrame READ currentFrame WRITE setCurrentFrame NOTIFY currentFrameChanged)
+    Q_PROPERTY(QString currentScreen READ currentScreen WRITE setCurrentScreen NOTIFY currentScreenChanged)
 
     QML_NAMED_ELEMENT(LauncherController)
     QML_SINGLETON
@@ -45,6 +46,8 @@ class LauncherController : public QObject
     bool isFullScreenFrame() const;
     QString currentFrame() const;
     void setCurrentFrame(const QString & frame);
+    QString currentScreen() const;
+    void setCurrentScreen(const QString & screen);
 
     Q_INVOKABLE void hideWithTimer();
     Q_INVOKABLE void setAvoidHide(bool avoidHide);
@@ -57,6 +60,7 @@ class LauncherController : public QObject
 
 signals:
     void currentFrameChanged();
+    void currentScreenChanged();
     void visibleChanged(bool visible);
 
 public:
@@ -83,6 +87,7 @@ class LauncherController : public QObject
     Launcher1Adaptor * m_launcher1Adaptor;
     bool m_visible;
     QString m_currentFrame;
+    QString m_currentScreen;
     bool m_pendingHide = false;
     bool m_avoidHide = true; 
 };

qml/Main.qml

@@ -143,6 +143,11 @@ QtObject {
             windowedFrame.requestActivate()
         } else {
             fullscreenFrame.requestActivate()
+            // Update current screen for wallpaper blur based on the screen where launcher is displayed
+            var currentScreen = fullscreenFrame.screen
+            if (currentScreen) {
+                LauncherController.currentScreen = currentScreen.name
+            }
         }
     }
 
@@ -315,7 +320,14 @@ QtObject {
 
         onVisibleChanged: {
             if (visible) {
-                requestActivate()
+                updateWindowVisibilityAndPosition()
+            }
+        }
+
+        onScreenChanged: {
+            // Update current screen when the window moves to a different screen
+            if (screen) {
+                LauncherController.currentScreen = screen.name
             }
         }
 

src/ddeintegration/appearance.cpp

@@ -8,10 +8,12 @@
 #include <QScreen>
 #include <QImage>
 #include <QLoggingCategory>
+#include <QCursor>
 
 #include "Appearance1.h"
 #include "blurhash.hpp"
 #include "../launchercontroller.h"
+#include "../desktopintegration.h"
 
 Q_LOGGING_CATEGORY(logDdeIntegration, "org.deepin.dde.launchpad.integration")
 
@@ -31,8 +33,11 @@ Appearance::Appearance(QObject *parent)
 
     connect(&(LauncherController::instance()), &LauncherController::currentFrameChanged,
             this, &Appearance::updateCurrentWallpaperBlurhash);
+    // Use a delayed call to wait for screen info to be ready after visible changes
     connect(&(LauncherController::instance()), &LauncherController::visibleChanged,
             this, &Appearance::updateCurrentWallpaperBlurhash);
+    connect(&(LauncherController::instance()), &LauncherController::currentScreenChanged,
+            this, &Appearance::updateCurrentWallpaperBlurhash);
 
     if (m_dbusAppearanceIface->isValid()) {
         connect(m_dbusAppearanceIface, &Appearance1::OpacityChanged, this, [this](double value) {
@@ -60,7 +65,21 @@ void Appearance::updateCurrentWallpaperBlurhash()
         return;
     }
 
-    const QString screenName = qApp->primaryScreen()->name();
+    // Use the current screen where the launcher is displayed
+    // Priority: 1. LauncherController.currentScreen, 2. Dock position, 3. Cursor position, 4. Primary screen
+    QString screenName = LauncherController::instance().currentScreen();
+    if (screenName.isEmpty()) {
+        // Try to get screen from dock position (launcher opens on the same screen as dock)
+        QRect dockGeometry = DesktopIntegration::instance().dockGeometry();
+        if (dockGeometry.isValid() && dockGeometry.x() >= 0) {
+            QPoint dockCenter = dockGeometry.center();
+            QScreen *screenAtDock = qApp->screenAt(dockCenter);
+            if (screenAtDock) {
+                screenName = screenAtDock->name();
+            }
+        }
+    }
+    qCDebug(logDdeIntegration) << "Getting wallpaper for screen:" << screenName;
     QDBusPendingReply<QString> async = m_dbusAppearanceIface->GetCurrentWorkspaceBackgroundForMonitor(screenName);
     QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(async, this);
     connect(watcher, &QDBusPendingCallWatcher::finished, this, [this](QDBusPendingCallWatcher* call){
@@ -72,14 +91,18 @@ void Appearance::updateCurrentWallpaperBlurhash()
             qCDebug(logDdeIntegration) << "Got wallpaper URL from dbus:" << wallpaperUrl;
 
             if (m_wallpaperBlurMap.contains(wallpaperUrl)) {
-                m_wallpaperBlurhash = m_wallpaperBlurMap.value(wallpaperUrl);
-                emit wallpaperBlurhashChanged();
+                QString newBlurhash = m_wallpaperBlurMap.value(wallpaperUrl);
+                if (m_wallpaperBlurhash != newBlurhash) {
+                    m_wallpaperBlurhash = newBlurhash;
+                    emit wallpaperBlurhashChanged();
+                }
             } else {
                 qCDebug(logDdeIntegration) << "No cached blurhash found, updating all wallpapers";
                 // try update new workspace background image
                 updateAllWallpaper();
             }
         }
+        call->deleteLater();
     });
 }
 
@@ -97,18 +120,15 @@ void Appearance::updateAllWallpaper()
         qCWarning(logDdeIntegration) << "Wallpaper document is not a JSON object";
         return;
     }
-    int i = 1;
-    do {
-        const QString k = QString("Primary&&%1").arg(i++);
-        QJsonValue v = doc[k];
-
-#ifdef QT_DEBUG
-        qDebug() << k << ":" << v;
-#endif
 
+    QJsonObject jsonObj = doc.object();
+    
+    // Iterate through all keys in the JSON object to get wallpapers for all screens
+    // Keys are in format "ScreenName&&WorkspaceIndex" (e.g., "eDP-1&&1", "HDMI-1&&1")
+    for (auto it = jsonObj.begin(); it != jsonObj.end(); ++it) {
+        QJsonValue v = it.value();
         if (!v.isString()) {
-            qCDebug(logDdeIntegration) << "No more wallpapers found at key:" << k;
-            break;
+            continue;
         }
 
         QUrl wallpaperUrl(v.toString());
@@ -146,7 +166,7 @@ void Appearance::updateAllWallpaper()
         });
 
         m_blurhashWatchers << watcher;
-    } while(1);
+    }
 }
 
 qreal Appearance::opacity() const