Revert "chore: Reimplement notification animation"

This reverts commit 2f8de93

Author: yixinshark

debian/changelog

@@ -1,3 +1,16 @@
+dde-shell (0.0.41) unstable; urgency=medium
+
+  * fix: incorrect animation application when dragging(Issue: 10330)
+  * fix: Dock following mouse display error when modifying SmartHide(Issue: 10404)
+  * fix: plugin process is pulled up again after crashed(Issue: 10400)
+  * fix: modify panel popup shadow offset and color(Issue: 10325)
+  * fix: forced exit is invalid(Issue: 10436)
+  * fix: searchItem right click response range is too large(Issue: 10294)
+  * fix: pupup surface doesn't release(Issue: 10121)
+  * chore: adjust iconSize for quickpanel(Issue: 9852)
+
+ -- Deepin Packages Builder <[email protected]>  Wed, 21 Aug 2024 17:32:09 +0800
+
 dde-shell (0.0.40) unstable; urgency=medium
 
   * fix: incorrect height for quickpanel's childplugin(Issue: 10036)

panels/dock/taskmanager/package/AppItem.qml

@@ -165,7 +165,14 @@ Item {
             name: root.iconName
             sourceSize: Qt.size(Dock.MAX_DOCK_TASKMANAGER_ICON_SIZE, Dock.MAX_DOCK_TASKMANAGER_ICON_SIZE)
             anchors.centerIn: parent
-            scale: Panel.rootObject.isDragging ? iconScale : iconScale
+            scale: iconScale
+            BeatAnimation {
+                id: beatAnimation
+                target: icon
+                baseScale: iconScale
+                loops: Animation.Infinite
+                running: root.attention
+            }
 
             LaunchAnimation {
                 id: launchAnimation
@@ -197,68 +204,20 @@ Item {
                 loops: 1
                 running: false
             }
-        }
-
-        // TODO: value can set during debugPanel
-        Repeater {
-            model: 5
-            Rectangle {
-                id: rect
-                required property int index
-                property var originSize: Dock.MAX_DOCK_TASKMANAGER_ICON_SIZE * 1.2 * iconScale
-
-                visible: root.attention && !Panel.rootObject.isDragging
-                width: originSize * (index - 1)
-                height: width
-                radius: width / 2
-                color: Qt.rgba(1, 1, 1, 0.1)
-
-                anchors.centerIn: icon
-                z: -1
-                opacity: Math.min(3 - width / originSize, blendColorAlpha(D.DTK.themeType === D.ApplicationHelper.DarkType ? 0.25 : 1.0))
-
-                function blendColorAlpha(fallback) {
-                    var appearance = DS.applet("org.deepin.ds.dde-appearance")
-                    if (!appearance || appearance.opacity < 0 || appearance.opacity > fallback || appearance.opacity < fallback)
-                        return fallback
-                    return appearance.opacity
-                }
-
-                SequentialAnimation {
-                    running: root.attention && !Panel.rootObject.isDragging
-                    loops: Animation.Infinite
 
-                    // 弹出
-                    ParallelAnimation {
-                        NumberAnimation { target: rect; property: "width"; from: Math.max(originSize * (index - 1), 0); to: originSize * (index); duration: 1200 }
-                        ColorAnimation { target: rect; property: "color"; from: Qt.rgba(1, 1, 1, 0.4); to: Qt.rgba(1, 1, 1, 0.1); duration: 1200 }
-                        NumberAnimation { target: icon; property: "scale"; from: iconScale; to: iconScale * 1.15; duration: 1200; easing.type: Easing.OutElastic; easing.amplitude: 1; easing.period: 0.2 }
+            Connections {
+                target: Panel.rootObject
+                function onPressedAndDragging(isDragging) {
+                    if (isDragging) {
+                        beatAnimation.stop()
+                        icon.scale = Qt.binding(function() {
+                            return root.iconScale
+                        })
+                    } else {
+                        beatAnimation.running = Qt.binding(function() {
+                            return root.attention
+                        })
                     }
-
-                    // 收缩
-                    ParallelAnimation {
-                        NumberAnimation { target: rect; property: "width"; from: originSize * (index); to: originSize * (index + 1); duration: 1200 }
-                        ColorAnimation { target: rect; property: "color"; from: Qt.rgba(1, 1, 1, 0.4); to: Qt.rgba(1, 1, 1, 0.1); duration: 1200 }
-                        NumberAnimation { target: icon; property: "scale"; from: iconScale * 1.15; to: iconScale; duration: 1200; easing.type: Easing.OutElastic; easing.amplitude: 1; easing.period: 0.2 }
-                    }
-
-                    // 停顿
-                    ParallelAnimation {
-                        NumberAnimation { target: rect; property: "width"; from: originSize * (index + 1); to: originSize * (index + 2); duration: 1200 }
-                        ColorAnimation { target: rect; property: "color"; from: Qt.rgba(1, 1, 1, 0.4); to: Qt.rgba(1, 1, 1, 0.1); duration: 1200 }
-                    }
-                }
-
-                D.BoxShadow {
-                    visible: rect.visible
-                    anchors.fill: rect
-                    z: -2
-                    shadowBlur: 20
-                    shadowColor : Qt.rgba(0, 0, 0, 0.05)
-                    shadowOffsetX : 0
-                    shadowOffsetY : 0
-                    cornerRadius: rect.radius
-                    hollow: true
                 }
             }
         }

panels/dock/taskmanager/package/BeatAnimation.qml

@@ -0,0 +1,110 @@
+// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import QtQuick 2.15
+
+SequentialAnimation {
+    property Item target: parent
+    id: root
+    property real baseScale
+
+    PropertyAnimation {
+        target: root.target
+        property: "scale"
+        from: baseScale
+        to: baseScale
+        duration: 880
+    }
+
+    PropertyAnimation {
+        target: root.target
+        property: "scale"
+        from: baseScale
+        to: baseScale * 1.2
+        duration: 120
+    }
+
+    PropertyAnimation {
+        target: root.target
+        property: "scale"
+        from: baseScale * 1.2
+        to: baseScale * 1.08
+        duration: 80
+    }
+
+    PropertyAnimation {
+        target: root.target
+        property: "scale"
+        from: baseScale * 1.08
+        to: baseScale * 1.16
+        duration: 120
+    }
+
+    PropertyAnimation {
+        target: root.target
+        property: "scale"
+        from: baseScale * 1.16
+        to: baseScale * 1.1
+        duration: 120
+    }
+
+    PropertyAnimation {
+        target: root.target
+        property: "scale"
+        from: baseScale * 1.1
+        to: baseScale * 1.15
+        duration: 120
+    }
+
+    PropertyAnimation {
+        target: root.target
+        property: "scale"
+        from: baseScale * 1.15
+        to: baseScale * 1.12
+        duration: 120
+    }
+
+    PropertyAnimation {
+        target: root.target
+        property: "scale"
+        from: baseScale * 1.12
+        to: baseScale * 0.9
+        duration: 160
+    }
+
+    PropertyAnimation {
+        target: root.target
+        property: "scale"
+        from: baseScale * 0.9
+        to: baseScale * 1.05
+        duration: 120
+    }
+
+    PropertyAnimation {
+        target: root.target
+        property: "scale"
+        from: baseScale * 1.05
+        to: baseScale * 0.95
+        duration: 120
+    }
+
+    PropertyAnimation {
+        target: root.target
+        property: "scale"
+        from: baseScale * 0.95
+        to: baseScale * 1
+        duration: 120
+    }
+
+    PropertyAnimation {
+        target: root.target
+        property: "scale"
+        from: baseScale * 1
+        to: baseScale * 1
+        duration: 480
+    }
+
+    onStopped: root.target.scale = baseScale
+    onFinished: loops = Animation.Infinite
+}

panels/dock/taskmanager/package/TaskManager.qml

@@ -58,7 +58,6 @@ ContainmentItem {
                 required property string menus
                 required property list<string> windows
                 keys: ["text/x-dde-dock-dnd-appid"]
-                z: attention ? -1 : 0
                 visible: itemId !== launcherDndDropArea.launcherDndDesktopId
 
                 states: [