bump version to 0.7.4

debian/changelog

@@ -1,3 +1,9 @@
+dde-launchpad (0.7.4) unstable; urgency=medium
+
+  * release 0.7.4
+
+ -- Mike Chen <[email protected]>  Mon, 24 Jun 2024 13:57:42 +0800
+
 dde-launchpad (0.7.3) unstable; urgency=medium
 
   * Fix #8694

launchercontroller.cpp

@@ -115,6 +115,11 @@ void LauncherController::setVisible(bool visible)
     emit visibleChanged(m_visible);
 }
 
+bool LauncherController::isFullScreenFrame() const
+{
+    return m_currentFrame == QStringLiteral("FullscreenFrame");
+}
+
 QString LauncherController::currentFrame() const
 {
     return m_currentFrame;

launchercontroller.h

@@ -42,6 +42,7 @@ class LauncherController : public QObject
 
     bool visible() const;
     void setVisible(bool visible);
+    bool isFullScreenFrame() const;
     QString currentFrame() const;
     void setCurrentFrame(const QString & frame);
 

qml/FolderGridViewPopup.qml

@@ -135,7 +135,7 @@ Popup {
                         scrollGestureEnabled: false
 
                         // TODO: this might not be the correct way to handle wheel
-                        onWheel: {
+                        onWheel: function (wheel) {
                             let xDelta = wheel.angleDelta.x / 8
                             let yDelta = wheel.angleDelta.y / 8
                             let toPage = 0; // -1 prev, +1 next, 0 don't change
@@ -145,14 +145,8 @@ Popup {
                                 toPage = (xDelta > 0) ? 1 : -1
                             }
                             if (toPage < 0) {
-                                if (!searchEdit.focus) { // reset keyboard focus when using mouse to flip page, but keep searchEdit focus
-                                    baseLayer.focus = true
-                                }
                                 decrementPageIndex(folderPagesView)
                             } else if (toPage > 0) {
-                                if (!searchEdit.focus) { // reset keyboard focus when using mouse to flip page, but keep searchEdit focus
-                                    baseLayer.focus = true
-                                }
                                 incrementPageIndex(folderPagesView)
                             }
                         }

qml/FullscreenFrame.qml

@@ -436,6 +436,12 @@ Control {
                                         gridViewContainer.checkPageSwitchState()
                                     }
                                 }
+                                Connections {
+                                    target: dropArea
+                                    function onDropped() {
+                                        gridViewContainer.checkPageSwitchState()
+                                    }
+                                }
                                 Component.onCompleted: {
                                     gridViewContainer.checkPageSwitchState()
                                 }

src/ddeintegration/appearance.cpp

@@ -26,10 +26,10 @@ Appearance::Appearance(QObject *parent)
         if (key == "allwallpaperuris") updateAllWallpaper();
     });
 
-    connect(&(LauncherController::instance()), &LauncherController::visibleChanged, this, [this](bool isVisible){
-        if (isVisible && (QStringLiteral("FullscreenFrame") == LauncherController::instance().currentFrame()))
-            updateCurrentWallpaperBlurhash();
-    });
+    connect(&(LauncherController::instance()), &LauncherController::currentFrameChanged,
+            this, &Appearance::updateCurrentWallpaperBlurhash);
+    connect(&(LauncherController::instance()), &LauncherController::visibleChanged,
+            this, &Appearance::updateCurrentWallpaperBlurhash);
 
     if (m_dbusAppearanceIface->isValid()) {
         connect(m_dbusAppearanceIface, &Appearance1::OpacityChanged, this, [this](double value) {
@@ -51,6 +51,9 @@ QString Appearance::wallpaperBlurhash() const
 
 void Appearance::updateCurrentWallpaperBlurhash()
 {
+    if (!LauncherController::instance().visible() || !LauncherController::instance().isFullScreenFrame())
+        return;
+
     const QString screenName = qApp->primaryScreen()->name();
     QDBusPendingReply<QString> async = m_dbusAppearanceIface->GetCurrentWorkspaceBackgroundForMonitor(screenName);
     QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(async, this);