launcher: fix transition between lists

Also fix wallpaper preview not switching back when using non dynamic scheme

2 files changed, 11 insertions, 23 deletions

diff --git a/modules/launcher/Content.qml b/modules/launcher/Content.qml
index 9e08a93..9ab6b40 100644
--- a/modules/launcher/Content.qml
+++ b/modules/launcher/Content.qml
@@ -81,7 +81,7 @@ Item {
                 const currentItem = list.currentList?.currentItem;
                 if (currentItem) {
                     if (list.showWallpapers) {
-                        if (currentItem.modelData.path !== Wallpapers.actualCurrent)
+                        if (Colours.scheme === "dynamic" && currentItem.modelData.path !== Wallpapers.actualCurrent)
                             Wallpapers.previewColourLock = true;
                         Wallpapers.setWallpaper(currentItem.modelData.path);
                         root.visibilities.launcher = false;
diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml
index 7a3da96..3ce39f1 100644
--- a/modules/launcher/ContentList.qml
+++ b/modules/launcher/ContentList.qml
@@ -52,7 +52,7 @@ Item {
         }
     ]
 
-    transitions: Transition {
+    Behavior on state {
         SequentialAnimation {
             NumberAnimation {
                 target: root
@@ -63,27 +63,15 @@ Item {
                 easing.type: Easing.BezierSpline
                 easing.bezierCurve: Appearance.anim.curves.standard
             }
-            PropertyAction {
-                targets: [appList, wallpaperList]
-                properties: "active"
-            }
-            ParallelAnimation {
-                NumberAnimation {
-                    target: root
-                    properties: "implicitWidth,implicitHeight"
-                    duration: Appearance.anim.durations.large
-                    easing.type: Easing.BezierSpline
-                    easing.bezierCurve: Appearance.anim.curves.emphasized
-                }
-                NumberAnimation {
-                    target: root
-                    property: "opacity"
-                    from: 0
-                    to: 1
-                    duration: Appearance.anim.durations.large
-                    easing.type: Easing.BezierSpline
-                    easing.bezierCurve: Appearance.anim.curves.standard
-                }
+            PropertyAction {}
+            NumberAnimation {
+                target: root
+                property: "opacity"
+                from: 0
+                to: 1
+                duration: Appearance.anim.durations.small
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: Appearance.anim.curves.standard
             }
         }
     }