marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-06-11 00:47:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Respect animation settings in navigation tutorial

Browse source 
Gate the navigation KCM tutorial timings on ShellSettings animationsEnabled so the demo stops animating when the user disables shell animations.
This commit is contained in:
Marco Allegretti 2026-05-21 11:15:01 +02:00
parent 753909a6ce
commit 24e410c733
2 changed files with 42 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
kcms/navigation/ui/TutorialPhone.qml
View file

@ -8,6 +8,7 @@ import QtQuick.Layouts
import org.kde.plasma.components 3.0 as PlasmaComponents
import org.kde.kirigami as Kirigami
import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings
Item {
id: root
@ -20,7 +21,16 @@ Item {
property bool showBackground: true
property int fingerSize: 20
property int _endTimeout: 2000
readonly property bool animationsEnabled: ShellSettings.Settings.animationsEnabled
readonly property int longAnimationDuration: animationsEnabled ? Kirigami.Units.longDuration : 0
readonly property int switcherDragDuration: animationsEnabled ? Math.round(Kirigami.Units.veryLongDuration * 3.75) : 0
readonly property int switcherSlideDuration: animationsEnabled ? Math.round(Kirigami.Units.veryLongDuration * 1.25) : 0
readonly property int flickDragDuration: animationsEnabled ? Math.round(Kirigami.Units.veryLongDuration * 2.25) : 0
readonly property int scrubSettleDuration: animationsEnabled ? Math.round(Kirigami.Units.veryLongDuration * 1.75) : 0
readonly property int quickAnimationDuration: animationsEnabled ? Math.round(Kirigami.Units.longDuration * 1.2) : 0
readonly property int sequencePauseDuration: animationsEnabled ? Math.round(Kirigami.Units.veryLongDuration * 1.25) : 0
readonly property int scrubLeadInDelay: animationsEnabled ? Kirigami.Units.veryLongDuration : 0
readonly property int _endTimeout: animationsEnabled ? Kirigami.Units.veryLongDuration * 5 : 0
Rectangle {
id: phone
@ -213,7 +223,7 @@ Item {
root.touchOnAnim.start()
}
duration: 1500
duration: root.switcherDragDuration
easing.type: Easing.InOutQuad
},
NumberAnimation {
@ -222,7 +232,7 @@ Item {
to: 0
duration: Kirigami.Units.longDuration
duration: root.longAnimationDuration
easing.type: Easing.InQuad
},
NumberAnimation {
@ -236,7 +246,7 @@ Item {
touchPoint.yPosition = 2;
root.touchOnAnim.start()
}
duration: 500
duration: root.switcherSlideDuration
easing.type: Easing.InOutQuad
},
NumberAnimation {
@ -245,14 +255,14 @@ Item {
to: 0
duration: Kirigami.Units.longDuration
duration: root.longAnimationDuration
easing.type: Easing.InQuad
}
]
delays: [
500,
500,
-Kirigami.Units.longDuration * 2,
root.sequencePauseDuration,
root.sequencePauseDuration,
-root.longAnimationDuration * 2,
]
}
@ -288,7 +298,7 @@ Item {
to: 0.55
duration: Kirigami.Units.longDuration
duration: root.longAnimationDuration
easing.type: Easing.InOutQuad
},
NumberAnimation {
@ -297,7 +307,7 @@ Item {
to: 0
duration: Kirigami.Units.longDuration
duration: root.longAnimationDuration
easing.type: Easing.InOutQuad
},
NumberAnimation {
@ -339,7 +349,7 @@ Item {
root.touchOnAnim.start()
}
duration: 900
duration: root.flickDragDuration
easing.type: Easing.InQuart
},
NumberAnimation {
@ -348,12 +358,12 @@ Item {
to: 0
duration: Kirigami.Units.longDuration
duration: root.longAnimationDuration
easing.type: Easing.InQuad
}
]
delays: [
-Kirigami.Units.longDuration,
-root.longAnimationDuration,
]
}
@ -390,7 +400,7 @@ Item {
to: 0.1
duration: 300
duration: root.quickAnimationDuration
easing.type: Easing.InQuad
},
NumberAnimation {
@ -399,7 +409,7 @@ Item {
to: 0
duration: 300
duration: root.quickAnimationDuration
easing.type: Easing.Linear
}
]
@ -433,7 +443,7 @@ Item {
root.touchOnAnim.start()
}
duration: 900
duration: root.flickDragDuration
easing.type: Easing.InOutQuart
},
NumberAnimation {
@ -443,7 +453,7 @@ Item {
from: 0
to: 1
duration: 1500
duration: root.switcherDragDuration
easing.type: Easing.InOutQuart
},
NumberAnimation {
@ -452,7 +462,7 @@ Item {
to: 0.5
duration: 700
duration: root.scrubSettleDuration
easing.type: Easing.InOutCubic
},
NumberAnimation {
@ -461,14 +471,14 @@ Item {
to: 0
duration: Kirigami.Units.longDuration
duration: root.longAnimationDuration
easing.type: Easing.InQuad
}
]
delays: [
0,
0,
500
root.sequencePauseDuration
]
}
@ -505,7 +515,7 @@ Item {
to: 0.55
duration: 300
duration: root.quickAnimationDuration
easing.type: Easing.InOutQuad
},
NumberAnimation {
@ -514,7 +524,7 @@ Item {
to: 0
duration: 300
duration: root.quickAnimationDuration
easing.type: Easing.InOutQuad
},
NumberAnimation {
@ -541,7 +551,7 @@ Item {
to: 1
duration: Kirigami.Units.longDuration
duration: root.longAnimationDuration
easing.type: Easing.InOutQuad
},
NumberAnimation { // move leftmost window out of the way, otherwise it overlaps
@ -550,7 +560,7 @@ Item {
to: 1.8
duration: Kirigami.Units.longDuration
duration: root.longAnimationDuration
easing.type: Easing.InOutQuad
},
NumberAnimation { // move middle window (that's to be focused) a bit to the side to counteract moving of the first window
@ -559,7 +569,7 @@ Item {
to: 0.4
duration: Kirigami.Units.longDuration
duration: root.longAnimationDuration
easing.type: Easing.Linear
},
NumberAnimation { // move first (rightmost) window to get a bit more space between it and the middle one during the animation
@ -568,14 +578,14 @@ Item {
to: 1
duration: Kirigami.Units.longDuration
duration: root.longAnimationDuration
easing.type: Easing.Linear
}
]
delays: [
400,
root.scrubLeadInDelay,
immediate,
scrubAnimation.animations[0].duration - 300 - 400,
scrubAnimation.animations[0].duration - root.quickAnimationDuration - root.scrubLeadInDelay,
scrubAnimation.delays[1],
scrubAnimation.delays[2],
immediate,
@ -655,7 +665,7 @@ Item {
to: 0
duration: Kirigami.Units.longDuration
duration: root.longAnimationDuration
easing.type: Easing.InQuad
}
@ -665,7 +675,7 @@ Item {
to: root.fingerSize
duration: Kirigami.Units.longDuration
duration: root.longAnimationDuration
easing.type: Easing.OutQuad
}
}

3
kcms/navigation/ui/main.qml
View file

@ -15,6 +15,7 @@ import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings
KCM.SimpleKCM {
id: root
readonly property int longAnimationDuration: ShellSettings.Settings.animationsEnabled ? Kirigami.Units.longDuration : 0
title: i18n("Navigation")
@ -140,7 +141,7 @@ KCM.SimpleKCM {
to: -tutorialSwitcherInput.activeTutorialIndex * (tutorialContainer.phoneWidth + tutorialLayout.spacing)
duration: Kirigami.Units.longDuration
duration: root.longAnimationDuration
easing.type: Easing.InOutQuad
}
}