diff options
| author | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-06-17 23:02:54 +1000 |
|---|---|---|
| committer | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-06-17 23:02:54 +1000 |
| commit | 491c0f1dbd601956f3f3b4fd56e1872632f2f814 (patch) | |
| tree | 3722ca258533d542a180a74f50930a98600ee4b6 | |
| parent | launcher: fix wallpaper preview colours (diff) | |
| download | caelestia-shell-491c0f1dbd601956f3f3b4fd56e1872632f2f814.tar.gz caelestia-shell-491c0f1dbd601956f3f3b4fd56e1872632f2f814.tar.bz2 caelestia-shell-491c0f1dbd601956f3f3b4fd56e1872632f2f814.zip | |
launcher: fix transition between lists
Also fix wallpaper preview not switching back when using non dynamic scheme
| -rw-r--r-- | modules/launcher/Content.qml | 2 | ||||
| -rw-r--r-- | modules/launcher/ContentList.qml | 32 | ||||
| -rw-r--r-- | services/Colours.qml | 7 |
3 files changed, 18 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 } } } diff --git a/services/Colours.qml b/services/Colours.qml index 53ca90e..3a26e84 100644 --- a/services/Colours.qml +++ b/services/Colours.qml @@ -12,6 +12,8 @@ Singleton { readonly property list<string> colourNames: ["rosewater", "flamingo", "pink", "mauve", "red", "maroon", "peach", "yellow", "green", "teal", "sky", "sapphire", "blue", "lavender"] property bool showPreview + property string scheme + property string flavour property bool light readonly property Colours palette: showPreview ? preview : current readonly property Colours current: Colours {} @@ -37,6 +39,11 @@ Singleton { const colours = isPreview ? preview : current; const scheme = JSON.parse(data); + if (!isPreview) { + root.scheme = scheme.name; + flavour = scheme.flavour; + } + light = scheme.mode === "light"; for (const [name, colour] of Object.entries(scheme.colours)) { |