diff --git a/components/Anim.qml b/components/Anim.qml index bf8eefb1..69484591 100644 --- a/components/Anim.qml +++ b/components/Anim.qml @@ -3,6 +3,5 @@ import Caelestia.Config NumberAnimation { duration: Tokens.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.standard + easing: Tokens.anim.standard } diff --git a/components/CAnim.qml b/components/CAnim.qml index 3b7b7b2f..b86fcce1 100644 --- a/components/CAnim.qml +++ b/components/CAnim.qml @@ -3,6 +3,5 @@ import Caelestia.Config ColorAnimation { duration: Tokens.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.standard + easing: Tokens.anim.standard } diff --git a/components/StateLayer.qml b/components/StateLayer.qml index 59c5cb23..545a7583 100644 --- a/components/StateLayer.qml +++ b/components/StateLayer.qml @@ -63,7 +63,7 @@ MouseArea { properties: "implicitWidth,implicitHeight" from: 0 to: rippleAnim.radius * 2 - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } Anim { target: ripple diff --git a/components/StyledText.qml b/components/StyledText.qml index 051f5804..83dc146d 100644 --- a/components/StyledText.qml +++ b/components/StyledText.qml @@ -29,12 +29,12 @@ Text { SequentialAnimation { Anim { to: root.animateFrom - easing.bezierCurve: Tokens.anim.curves.standardAccel + easing: Tokens.anim.standardAccel } PropertyAction {} Anim { to: root.animateTo - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } } } @@ -43,6 +43,5 @@ Text { target: root property: root.animateProp duration: root.animateDuration / 2 - easing.type: Easing.BezierSpline } } diff --git a/components/controls/CollapsibleSection.qml b/components/controls/CollapsibleSection.qml index 19c7da9b..95aae8ee 100644 --- a/components/controls/CollapsibleSection.qml +++ b/components/controls/CollapsibleSection.qml @@ -56,7 +56,7 @@ ColumnLayout { Behavior on rotation { Anim { duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.standard + easing: Tokens.anim.standard } } } @@ -84,7 +84,7 @@ ColumnLayout { Behavior on Layout.preferredHeight { Anim { - easing.bezierCurve: Tokens.anim.curves.standard + easing: Tokens.anim.standard } } @@ -99,7 +99,7 @@ ColumnLayout { Behavior on opacity { Anim { - easing.bezierCurve: Tokens.anim.curves.standard + easing: Tokens.anim.standard } } } @@ -118,7 +118,7 @@ ColumnLayout { Behavior on opacity { Anim { - easing.bezierCurve: Tokens.anim.curves.standard + easing: Tokens.anim.standard } } diff --git a/components/controls/FilledSlider.qml b/components/controls/FilledSlider.qml index 5a65722f..c71f65e9 100644 --- a/components/controls/FilledSlider.qml +++ b/components/controls/FilledSlider.qml @@ -97,7 +97,7 @@ Slider { property: "scale" to: 0 duration: Tokens.anim.durations.normal / 2 - easing.bezierCurve: Tokens.anim.curves.standardAccel + easing: Tokens.anim.standardAccel } ScriptAction { script: icon.update() @@ -107,7 +107,7 @@ Slider { property: "scale" to: 1 duration: Tokens.anim.durations.normal / 2 - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } } } diff --git a/components/controls/Menu.qml b/components/controls/Menu.qml index 6c375767..966837ea 100644 --- a/components/controls/Menu.qml +++ b/components/controls/Menu.qml @@ -109,7 +109,7 @@ Elevation { Behavior on implicitHeight { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } diff --git a/components/controls/SplitButton.qml b/components/controls/SplitButton.qml index 8759635c..cdea38f0 100644 --- a/components/controls/SplitButton.qml +++ b/components/controls/SplitButton.qml @@ -86,7 +86,7 @@ Row { Behavior on Layout.preferredWidth { Anim { - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } } diff --git a/components/controls/StyledSwitch.qml b/components/controls/StyledSwitch.qml index 92cde7da..be7eb9c5 100644 --- a/components/controls/StyledSwitch.qml +++ b/components/controls/StyledSwitch.qml @@ -146,7 +146,6 @@ Switch { component PropAnim: PropertyAnimation { duration: Tokens.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.standard + easing: Tokens.anim.standard } } diff --git a/components/controls/ToggleButton.qml b/components/controls/ToggleButton.qml index 4e4174b0..fce6215b 100644 --- a/components/controls/ToggleButton.qml +++ b/components/controls/ToggleButton.qml @@ -88,14 +88,14 @@ StyledRect { Behavior on radius { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } Behavior on Layout.preferredWidth { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } diff --git a/components/controls/Tooltip.qml b/components/controls/Tooltip.qml index fdb27bea..06b292de 100644 --- a/components/controls/Tooltip.qml +++ b/components/controls/Tooltip.qml @@ -101,7 +101,7 @@ Popup { from: 0 to: 1 duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } @@ -111,7 +111,7 @@ Popup { from: 1 to: 0 duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } diff --git a/components/filedialog/FolderContents.qml b/components/filedialog/FolderContents.qml index 980bd3e1..ebd5098d 100644 --- a/components/filedialog/FolderContents.qml +++ b/components/filedialog/FolderContents.qml @@ -121,7 +121,7 @@ Item { from: 0 to: 1 duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } @@ -140,12 +140,12 @@ Item { Anim { properties: "opacity,scale" to: 1 - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } Anim { properties: "x,y" duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } diff --git a/components/widgets/ExtraIndicator.qml b/components/widgets/ExtraIndicator.qml index 938f1ec1..1c766bf0 100644 --- a/components/widgets/ExtraIndicator.qml +++ b/components/widgets/ExtraIndicator.qml @@ -45,7 +45,7 @@ StyledRect { Behavior on scale { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } } diff --git a/modules/areapicker/Picker.qml b/modules/areapicker/Picker.qml index 6234d192..6399981f 100644 --- a/modules/areapicker/Picker.qml +++ b/modules/areapicker/Picker.qml @@ -308,6 +308,6 @@ MouseArea { component ExAnim: Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/background/Background.qml b/modules/background/Background.qml index 1fe3be74..547fdc9b 100644 --- a/modules/background/Background.qml +++ b/modules/background/Background.qml @@ -147,7 +147,7 @@ Variants { transitions: Transition { AnchorAnimation { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/background/DesktopClock.qml b/modules/background/DesktopClock.qml index 43f3fcef..c184df78 100644 --- a/modules/background/DesktopClock.qml +++ b/modules/background/DesktopClock.qml @@ -159,7 +159,7 @@ Item { Behavior on clockScale { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/bar/BarWrapper.qml b/modules/bar/BarWrapper.qml index 52050e05..1f10d366 100644 --- a/modules/bar/BarWrapper.qml +++ b/modules/bar/BarWrapper.qml @@ -58,7 +58,7 @@ Item { target: root property: "implicitWidth" duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } }, Transition { @@ -68,7 +68,7 @@ Item { Anim { target: root property: "implicitWidth" - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } ] diff --git a/modules/bar/components/ActiveWindow.qml b/modules/bar/components/ActiveWindow.qml index 63cdb04a..5979edd4 100644 --- a/modules/bar/components/ActiveWindow.qml +++ b/modules/bar/components/ActiveWindow.qml @@ -102,7 +102,7 @@ Item { Behavior on implicitHeight { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/bar/components/StatusIcons.qml b/modules/bar/components/StatusIcons.qml index c2a4b047..3b11036b 100644 --- a/modules/bar/components/StatusIcons.qml +++ b/modules/bar/components/StatusIcons.qml @@ -212,13 +212,13 @@ StyledRect { from: 1 to: 0 duration: Tokens.anim.durations.large - easing.bezierCurve: Tokens.anim.curves.standardAccel + easing: Tokens.anim.standardAccel } Anim { from: 0 to: 1 duration: Tokens.anim.durations.large - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } } } diff --git a/modules/bar/components/Tray.qml b/modules/bar/components/Tray.qml index 98650fae..5adc5e57 100644 --- a/modules/bar/components/Tray.qml +++ b/modules/bar/components/Tray.qml @@ -49,7 +49,7 @@ StyledRect { properties: "scale" from: 0 to: 1 - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } } @@ -57,7 +57,7 @@ StyledRect { Anim { properties: "scale" to: 1 - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } Anim { properties: "x,y" @@ -117,7 +117,7 @@ StyledRect { Behavior on implicitHeight { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } diff --git a/modules/bar/components/workspaces/ActiveIndicator.qml b/modules/bar/components/workspaces/ActiveIndicator.qml index c76f9457..e9a32b45 100644 --- a/modules/bar/components/workspaces/ActiveIndicator.qml +++ b/modules/bar/components/workspaces/ActiveIndicator.qml @@ -93,6 +93,6 @@ StyledRect { } component EAnim: Anim { - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } diff --git a/modules/bar/components/workspaces/OccupiedBg.qml b/modules/bar/components/workspaces/OccupiedBg.qml index da7e70c6..c54db55c 100644 --- a/modules/bar/components/workspaces/OccupiedBg.qml +++ b/modules/bar/components/workspaces/OccupiedBg.qml @@ -76,7 +76,7 @@ Item { Behavior on scale { Anim { - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } } diff --git a/modules/bar/components/workspaces/SpecialWorkspaces.qml b/modules/bar/components/workspaces/SpecialWorkspaces.qml index 70eb22a0..a825c1e5 100644 --- a/modules/bar/components/workspaces/SpecialWorkspaces.qml +++ b/modules/bar/components/workspaces/SpecialWorkspaces.qml @@ -119,7 +119,7 @@ Item { properties: "scale" from: 0 to: 1 - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } } @@ -140,7 +140,7 @@ Item { Anim { properties: "scale" to: 1 - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } Anim { properties: "x,y" @@ -151,7 +151,7 @@ Item { Anim { properties: "scale" to: 1 - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } Anim { properties: "x,y" @@ -192,13 +192,13 @@ Item { Behavior on y { Anim { - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } Behavior on implicitHeight { Anim { - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } } @@ -328,7 +328,7 @@ Item { properties: "scale" from: 0 to: 1 - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } } @@ -336,7 +336,7 @@ Item { Anim { properties: "scale" to: 1 - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } Anim { properties: "x,y" diff --git a/modules/bar/components/workspaces/Workspace.qml b/modules/bar/components/workspaces/Workspace.qml index 62d09d4b..e57f6f5e 100644 --- a/modules/bar/components/workspaces/Workspace.qml +++ b/modules/bar/components/workspaces/Workspace.qml @@ -74,7 +74,7 @@ ColumnLayout { properties: "scale" from: 0 to: 1 - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } } @@ -82,7 +82,7 @@ ColumnLayout { Anim { properties: "scale" to: 1 - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } Anim { properties: "x,y" diff --git a/modules/bar/popouts/Battery.qml b/modules/bar/popouts/Battery.qml index 149e21c2..cbcdc715 100644 --- a/modules/bar/popouts/Battery.qml +++ b/modules/bar/popouts/Battery.qml @@ -149,8 +149,7 @@ Column { transitions: Transition { AnchorAnimation { duration: Tokens.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } } diff --git a/modules/bar/popouts/ClipWrapper.qml b/modules/bar/popouts/ClipWrapper.qml index 810ac2e5..68c301a8 100644 --- a/modules/bar/popouts/ClipWrapper.qml +++ b/modules/bar/popouts/ClipWrapper.qml @@ -36,14 +36,14 @@ Item { Behavior on offsetScale { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } Behavior on x { Anim { duration: content.animLength - easing.bezierCurve: content.animCurve + easing: content.animCurve } } @@ -52,7 +52,7 @@ Item { Anim { duration: content.animLength - easing.bezierCurve: content.animCurve + easing: content.animCurve } } diff --git a/modules/bar/popouts/WirelessPassword.qml b/modules/bar/popouts/WirelessPassword.qml index 15317069..f1a79366 100644 --- a/modules/bar/popouts/WirelessPassword.qml +++ b/modules/bar/popouts/WirelessPassword.qml @@ -455,7 +455,7 @@ ColumnLayout { Behavior on scale { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } } diff --git a/modules/bar/popouts/Wrapper.qml b/modules/bar/popouts/Wrapper.qml index fbf5075f..d99ffdab 100644 --- a/modules/bar/popouts/Wrapper.qml +++ b/modules/bar/popouts/Wrapper.qml @@ -33,12 +33,12 @@ Item { property string queuedMode property int animLength: Tokens.anim.durations.expressiveDefaultSpatial - property list animCurve: Tokens.anim.curves.expressiveDefaultSpatial + property easingCurve animCurve: Tokens.anim.expressiveDefaultSpatial function setAnims(detach: bool): void { const type = `expressive${detach ? "Slow" : "Default"}Spatial`; animLength = Tokens.anim.durations[type]; - animCurve = Tokens.anim.curves[type]; + animCurve = Tokens.anim[type]; } function detach(mode: string): void { @@ -140,7 +140,7 @@ Item { Behavior on implicitWidth { Anim { duration: root.animLength - easing.bezierCurve: root.animCurve + easing: root.animCurve } } @@ -149,7 +149,7 @@ Item { Anim { duration: root.animLength - easing.bezierCurve: root.animCurve + easing: root.animCurve } } diff --git a/modules/controlcenter/NavRail.qml b/modules/controlcenter/NavRail.qml index 706d9d98..fe80493a 100644 --- a/modules/controlcenter/NavRail.qml +++ b/modules/controlcenter/NavRail.qml @@ -104,14 +104,14 @@ Item { Behavior on implicitWidth { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } Behavior on implicitHeight { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } @@ -162,7 +162,7 @@ Item { Anim { properties: "implicitWidth,implicitHeight" duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/controlcenter/bluetooth/Details.qml b/modules/controlcenter/bluetooth/Details.qml index 04b4ba01..42ceace2 100644 --- a/modules/controlcenter/bluetooth/Details.qml +++ b/modules/controlcenter/bluetooth/Details.qml @@ -174,8 +174,7 @@ StyledFlickable { transitions: Transition { AnchorAnimation { duration: Tokens.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.standard + easing: Tokens.anim.standard } Anim { properties: "implicitHeight,opacity,padding" @@ -266,7 +265,7 @@ StyledFlickable { Behavior on scale { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } } @@ -500,7 +499,7 @@ StyledFlickable { Anim { property: "implicitWidth" duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } Anim { property: "opacity" @@ -520,7 +519,7 @@ StyledFlickable { Anim { property: "implicitWidth" duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } Anim { property: "opacity" @@ -613,7 +612,7 @@ StyledFlickable { Anim { properties: "implicitWidth,implicitHeight" duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } Anim { properties: "radius,font.pointSize" diff --git a/modules/controlcenter/bluetooth/Settings.qml b/modules/controlcenter/bluetooth/Settings.qml index bd09deeb..2588a28c 100644 --- a/modules/controlcenter/bluetooth/Settings.qml +++ b/modules/controlcenter/bluetooth/Settings.qml @@ -171,7 +171,7 @@ ColumnLayout { Behavior on scale { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } } @@ -251,14 +251,14 @@ ColumnLayout { Behavior on scale { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } Behavior on implicitHeight { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } @@ -315,8 +315,7 @@ ColumnLayout { transitions: Transition { AnchorAnimation { duration: Tokens.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.standard + easing: Tokens.anim.standard } Anim { properties: "implicitHeight,opacity,padding" @@ -406,7 +405,7 @@ ColumnLayout { Behavior on scale { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } } diff --git a/modules/controlcenter/components/ConnectedButtonGroup.qml b/modules/controlcenter/components/ConnectedButtonGroup.qml index e95fa094..b4ddfc22 100644 --- a/modules/controlcenter/components/ConnectedButtonGroup.qml +++ b/modules/controlcenter/components/ConnectedButtonGroup.qml @@ -99,14 +99,14 @@ StyledRect { Behavior on Layout.preferredWidth { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } Behavior on radius { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } } diff --git a/modules/controlcenter/components/PaneTransition.qml b/modules/controlcenter/components/PaneTransition.qml index a025f7d0..489d3c78 100644 --- a/modules/controlcenter/components/PaneTransition.qml +++ b/modules/controlcenter/components/PaneTransition.qml @@ -21,8 +21,7 @@ SequentialAnimation { from: root.opacityFrom to: root.opacityTo duration: Tokens.anim.durations.normal / 2 - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.standardAccel + easing: Tokens.anim.standardAccel } NumberAnimation { @@ -31,8 +30,7 @@ SequentialAnimation { from: root.scaleFrom to: root.scaleTo duration: Tokens.anim.durations.normal / 2 - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.standardAccel + easing: Tokens.anim.standardAccel } } @@ -54,8 +52,7 @@ SequentialAnimation { from: root.opacityTo to: root.opacityFrom duration: Tokens.anim.durations.normal / 2 - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } NumberAnimation { @@ -64,8 +61,7 @@ SequentialAnimation { from: root.scaleTo to: root.scaleFrom duration: Tokens.anim.durations.normal / 2 - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } } } diff --git a/modules/controlcenter/network/VpnDetails.qml b/modules/controlcenter/network/VpnDetails.qml index 214e4eb3..9906ef37 100644 --- a/modules/controlcenter/network/VpnDetails.qml +++ b/modules/controlcenter/network/VpnDetails.qml @@ -277,14 +277,14 @@ DeviceDetails { from: 0 to: 1 duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } Anim { property: "scale" from: 0.7 to: 1 duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } @@ -294,14 +294,14 @@ DeviceDetails { from: 1 to: 0 duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } Anim { property: "scale" from: 1 to: 0.7 duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } diff --git a/modules/controlcenter/network/VpnList.qml b/modules/controlcenter/network/VpnList.qml index 5ca385cb..05054876 100644 --- a/modules/controlcenter/network/VpnList.qml +++ b/modules/controlcenter/network/VpnList.qml @@ -382,14 +382,14 @@ ColumnLayout { from: 0 to: 1 duration: Tokens.anim.durations.normal - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } Anim { property: "scale" from: 0.7 to: 1 duration: Tokens.anim.durations.normal - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } } @@ -401,14 +401,14 @@ ColumnLayout { from: 1 to: 0 duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } Anim { property: "scale" from: 1 to: 0.7 duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } } @@ -435,7 +435,7 @@ ColumnLayout { Behavior on implicitHeight { Anim { duration: Tokens.anim.durations.normal - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } } @@ -446,7 +446,7 @@ ColumnLayout { Behavior on implicitHeight { Anim { duration: Tokens.anim.durations.normal - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } @@ -461,7 +461,7 @@ ColumnLayout { Behavior on opacity { Anim { duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } @@ -584,7 +584,7 @@ ColumnLayout { Behavior on opacity { Anim { duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } @@ -823,7 +823,7 @@ ColumnLayout { property: "opacity" to: 0 duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } @@ -839,7 +839,7 @@ ColumnLayout { property: "opacity" to: 1 duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } } diff --git a/modules/controlcenter/network/WirelessPasswordDialog.qml b/modules/controlcenter/network/WirelessPasswordDialog.qml index 14fb565a..4222ddf4 100644 --- a/modules/controlcenter/network/WirelessPasswordDialog.qml +++ b/modules/controlcenter/network/WirelessPasswordDialog.qml @@ -379,7 +379,7 @@ Item { Behavior on scale { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } } diff --git a/modules/dashboard/Content.qml b/modules/dashboard/Content.qml index a07aca41..6fc7faea 100644 --- a/modules/dashboard/Content.qml +++ b/modules/dashboard/Content.qml @@ -200,14 +200,14 @@ Item { Behavior on implicitWidth { Anim { duration: Tokens.anim.durations.large - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } Behavior on implicitHeight { Anim { duration: Tokens.anim.durations.large - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } } diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml index 43a2311e..29de3934 100644 --- a/modules/dashboard/Media.qml +++ b/modules/dashboard/Media.qml @@ -501,12 +501,12 @@ Item { Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Tokens.padding.large : internalChecked ? Tokens.padding.smaller : 0) radius: stateLayer.pressed ? Tokens.rounding.small / 2 : internalChecked ? Tokens.rounding.small : implicitHeight / 2 radiusAnim.duration: Tokens.anim.durations.expressiveFastSpatial - radiusAnim.easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + radiusAnim.easing: Tokens.anim.expressiveFastSpatial Behavior on Layout.preferredWidth { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } } diff --git a/modules/dashboard/Tabs.qml b/modules/dashboard/Tabs.qml index 04728d2e..54e80c7a 100644 --- a/modules/dashboard/Tabs.qml +++ b/modules/dashboard/Tabs.qml @@ -164,15 +164,14 @@ Item { from: 0 to: rippleAnim.radius * 2 duration: Tokens.anim.durations.normal - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } Anim { target: ripple property: "opacity" to: 0 duration: Tokens.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.standard + easing: Tokens.anim.standard } } diff --git a/modules/dashboard/Wrapper.qml b/modules/dashboard/Wrapper.qml index e01dc0f0..7a810dc0 100644 --- a/modules/dashboard/Wrapper.qml +++ b/modules/dashboard/Wrapper.qml @@ -41,7 +41,7 @@ Item { Behavior on offsetScale { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/dashboard/dash/Calendar.qml b/modules/dashboard/dash/Calendar.qml index d415a031..38d2d563 100644 --- a/modules/dashboard/dash/Calendar.qml +++ b/modules/dashboard/dash/Calendar.qml @@ -237,14 +237,14 @@ CustomMouseArea { Behavior on x { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } Behavior on y { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } diff --git a/modules/dashboard/dash/User.qml b/modules/dashboard/dash/User.qml index 3b13bc7c..83ddcb2e 100644 --- a/modules/dashboard/dash/User.qml +++ b/modules/dashboard/dash/User.qml @@ -91,7 +91,7 @@ Row { Behavior on scale { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } diff --git a/modules/drawers/ContentWindow.qml b/modules/drawers/ContentWindow.qml index ce2196bf..8d665477 100644 --- a/modules/drawers/ContentWindow.qml +++ b/modules/drawers/ContentWindow.qml @@ -74,24 +74,21 @@ StyledWindow { Behavior on borderThickness { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } Behavior on borderRounding { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } Behavior on shadowOpacity { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } @@ -222,7 +219,7 @@ StyledWindow { Behavior on extraWidth { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } diff --git a/modules/launcher/AppList.qml b/modules/launcher/AppList.qml index bdad31e0..dc3ee16c 100644 --- a/modules/launcher/AppList.qml +++ b/modules/launcher/AppList.qml @@ -43,7 +43,7 @@ StyledListView { Behavior on y { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } @@ -119,7 +119,7 @@ StyledListView { from: 1 to: 0 duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.standardAccel + easing: Tokens.anim.standardAccel } Anim { target: root @@ -127,7 +127,7 @@ StyledListView { from: 1 to: 0.9 duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.standardAccel + easing: Tokens.anim.standardAccel } } PropertyAction { @@ -141,7 +141,7 @@ StyledListView { from: 0 to: 1 duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } Anim { target: root @@ -149,7 +149,7 @@ StyledListView { from: 0.9 to: 1 duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } } PropertyAction { diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml index e59dd382..ac10fd4d 100644 --- a/modules/launcher/ContentList.qml +++ b/modules/launcher/ContentList.qml @@ -155,7 +155,7 @@ Item { Anim { duration: Tokens.anim.durations.large - easing.bezierCurve: Tokens.anim.curves.emphasizedDecel + easing: Tokens.anim.emphasizedDecel } } @@ -164,7 +164,7 @@ Item { Anim { duration: Tokens.anim.durations.large - easing.bezierCurve: Tokens.anim.curves.emphasizedDecel + easing: Tokens.anim.emphasizedDecel } } } diff --git a/modules/launcher/Wrapper.qml b/modules/launcher/Wrapper.qml index fda2a111..b0b8753b 100644 --- a/modules/launcher/Wrapper.qml +++ b/modules/launcher/Wrapper.qml @@ -42,7 +42,7 @@ Item { Behavior on offsetScale { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/launcher/items/CalcItem.qml b/modules/launcher/items/CalcItem.qml index d18cbf90..0585276f 100644 --- a/modules/launcher/items/CalcItem.qml +++ b/modules/launcher/items/CalcItem.qml @@ -120,7 +120,7 @@ Item { Behavior on implicitWidth { Anim { - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } } diff --git a/modules/lock/InputField.qml b/modules/lock/InputField.qml index fdae94f7..bc0b3312 100644 --- a/modules/lock/InputField.qml +++ b/modules/lock/InputField.qml @@ -135,7 +135,7 @@ Item { Behavior on scale { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } } diff --git a/modules/lock/LockSurface.qml b/modules/lock/LockSurface.qml index d0001e23..cbb2e4f0 100644 --- a/modules/lock/LockSurface.qml +++ b/modules/lock/LockSurface.qml @@ -34,7 +34,7 @@ WlSessionLockSurface { properties: "implicitWidth,implicitHeight" to: lockContent.size duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } Anim { target: lockBg @@ -46,7 +46,7 @@ WlSessionLockSurface { property: "scale" to: 0 duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } Anim { target: content @@ -102,14 +102,14 @@ WlSessionLockSurface { property: "scale" to: 1 duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } Anim { target: lockContent property: "rotation" to: 360 duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.standardAccel + easing: Tokens.anim.standardAccel } } ParallelAnimation { @@ -117,7 +117,7 @@ WlSessionLockSurface { target: lockIcon property: "rotation" to: 360 - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } Anim { target: lockIcon @@ -134,7 +134,7 @@ WlSessionLockSurface { property: "scale" to: 1 duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } Anim { target: lockBg @@ -146,14 +146,14 @@ WlSessionLockSurface { property: "implicitWidth" to: (root.screen?.height ?? 0) * Tokens.sizes.lock.heightMult * Tokens.sizes.lock.ratio duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } Anim { target: lockContent property: "implicitHeight" to: (root.screen?.height ?? 0) * Tokens.sizes.lock.heightMult duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } diff --git a/modules/lock/Media.qml b/modules/lock/Media.qml index c93d830e..1f876daf 100644 --- a/modules/lock/Media.qml +++ b/modules/lock/Media.qml @@ -194,14 +194,14 @@ Item { Behavior on Layout.preferredWidth { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } Behavior on radius { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } } diff --git a/modules/lock/NotifDock.qml b/modules/lock/NotifDock.qml index 131eeec2..57587f8f 100644 --- a/modules/lock/NotifDock.qml +++ b/modules/lock/NotifDock.qml @@ -104,7 +104,7 @@ ColumnLayout { from: 0 to: 1 duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } @@ -127,7 +127,7 @@ ColumnLayout { Anim { property: "y" duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } @@ -139,7 +139,7 @@ ColumnLayout { Anim { property: "y" duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } diff --git a/modules/lock/NotifGroup.qml b/modules/lock/NotifGroup.qml index 2fdb6fb1..e7d77a20 100644 --- a/modules/lock/NotifGroup.qml +++ b/modules/lock/NotifGroup.qml @@ -299,7 +299,7 @@ StyledRect { Behavior on implicitHeight { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/notifications/Content.qml b/modules/notifications/Content.qml index e32b84c6..a0a964b0 100644 --- a/modules/notifications/Content.qml +++ b/modules/notifications/Content.qml @@ -172,7 +172,7 @@ Item { property: "x" to: (notif.x >= 0 ? Tokens.sizes.notifs.width : -Tokens.sizes.notifs.width) * 2 duration: Tokens.anim.durations.normal - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } PropertyAction { target: wrapper @@ -200,7 +200,6 @@ Item { component Anim: NumberAnimation { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/notifications/Notification.qml b/modules/notifications/Notification.qml index 2d4c4901..63d27e69 100644 --- a/modules/notifications/Notification.qml +++ b/modules/notifications/Notification.qml @@ -36,7 +36,7 @@ StyledRect { Behavior on x { Anim { - easing.bezierCurve: Tokens.anim.curves.emphasizedDecel + easing: Tokens.anim.emphasizedDecel } } @@ -102,7 +102,7 @@ StyledRect { Behavior on implicitHeight { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } @@ -217,7 +217,7 @@ StyledRect { Behavior on sweepAngle { Anim { - easing.bezierCurve: Tokens.anim.curves.emphasizedDecel + easing: Tokens.anim.emphasizedDecel } } } @@ -287,8 +287,7 @@ StyledRect { } AnchorAnimation { duration: Tokens.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.standard + easing: Tokens.anim.standard } } @@ -331,8 +330,7 @@ StyledRect { transitions: Transition { AnchorAnimation { duration: Tokens.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Tokens.anim.curves.standard + easing: Tokens.anim.standard } } } diff --git a/modules/osd/Content.qml b/modules/osd/Content.qml index 3a82f0d0..521b803c 100644 --- a/modules/osd/Content.qml +++ b/modules/osd/Content.qml @@ -117,7 +117,7 @@ Item { Behavior on Layout.preferredHeight { Anim { - easing.bezierCurve: Tokens.anim.curves.emphasized + easing: Tokens.anim.emphasized } } diff --git a/modules/osd/Wrapper.qml b/modules/osd/Wrapper.qml index 1c593e84..2d7986a7 100644 --- a/modules/osd/Wrapper.qml +++ b/modules/osd/Wrapper.qml @@ -47,7 +47,7 @@ Item { Behavior on offsetScale { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/session/Wrapper.qml b/modules/session/Wrapper.qml index f211cfbe..417bd95a 100644 --- a/modules/session/Wrapper.qml +++ b/modules/session/Wrapper.qml @@ -24,7 +24,7 @@ Item { Behavior on offsetScale { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/sidebar/Notif.qml b/modules/sidebar/Notif.qml index aa80d068..6394a0e6 100644 --- a/modules/sidebar/Notif.qml +++ b/modules/sidebar/Notif.qml @@ -125,7 +125,7 @@ StyledRect { Behavior on implicitHeight { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/sidebar/NotifActionList.qml b/modules/sidebar/NotifActionList.qml index 320fd1a3..09da396c 100644 --- a/modules/sidebar/NotifActionList.qml +++ b/modules/sidebar/NotifActionList.qml @@ -184,14 +184,14 @@ Item { Behavior on Layout.preferredWidth { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } Behavior on radius { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } } diff --git a/modules/sidebar/NotifDock.qml b/modules/sidebar/NotifDock.qml index a819f52b..b9930409 100644 --- a/modules/sidebar/NotifDock.qml +++ b/modules/sidebar/NotifDock.qml @@ -203,7 +203,7 @@ Item { Behavior on scale { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } diff --git a/modules/sidebar/NotifDockList.qml b/modules/sidebar/NotifDockList.qml index 80d091c3..9803155d 100644 --- a/modules/sidebar/NotifDockList.qml +++ b/modules/sidebar/NotifDockList.qml @@ -130,7 +130,7 @@ LazyListView { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } @@ -141,14 +141,14 @@ LazyListView { Behavior on scale { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } Behavior on x { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } @@ -160,6 +160,6 @@ LazyListView { target: root.container property: "contentY" duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/sidebar/NotifGroup.qml b/modules/sidebar/NotifGroup.qml index 2616d805..2314dfe5 100644 --- a/modules/sidebar/NotifGroup.qml +++ b/modules/sidebar/NotifGroup.qml @@ -237,14 +237,14 @@ StyledRect { Behavior on rotation { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } Behavior on Layout.topMargin { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } diff --git a/modules/sidebar/NotifGroupList.qml b/modules/sidebar/NotifGroupList.qml index 32d8d678..4aecf75f 100644 --- a/modules/sidebar/NotifGroupList.qml +++ b/modules/sidebar/NotifGroupList.qml @@ -133,7 +133,7 @@ LazyListView { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } @@ -148,7 +148,7 @@ LazyListView { Behavior on x { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } diff --git a/modules/sidebar/Wrapper.qml b/modules/sidebar/Wrapper.qml index e2d8f5a6..aff42f69 100644 --- a/modules/sidebar/Wrapper.qml +++ b/modules/sidebar/Wrapper.qml @@ -21,7 +21,7 @@ Item { Behavior on offsetScale { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/utilities/RecordingDeleteModal.qml b/modules/utilities/RecordingDeleteModal.qml index 9d89fb8f..7d7bcac8 100644 --- a/modules/utilities/RecordingDeleteModal.qml +++ b/modules/utilities/RecordingDeleteModal.qml @@ -196,7 +196,7 @@ Loader { Behavior on scale { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } diff --git a/modules/utilities/Wrapper.qml b/modules/utilities/Wrapper.qml index c8f87c36..f36444eb 100644 --- a/modules/utilities/Wrapper.qml +++ b/modules/utilities/Wrapper.qml @@ -48,7 +48,7 @@ Item { Anim { property: "sidebarLerp" duration: Tokens.anim.durations.expressiveDefaultSpatial / 2 - easing.bezierCurve: Tokens.anim.curves.standardAccel + easing: Tokens.anim.standardAccel } }, Transition { @@ -57,7 +57,7 @@ Item { Anim { property: "sidebarLerp" duration: Tokens.anim.durations.expressiveDefaultSpatial / 2 - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } } ] @@ -65,7 +65,7 @@ Item { Behavior on offsetScale { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } diff --git a/modules/utilities/cards/IdleInhibit.qml b/modules/utilities/cards/IdleInhibit.qml index 30176f29..08427e7c 100644 --- a/modules/utilities/cards/IdleInhibit.qml +++ b/modules/utilities/cards/IdleInhibit.qml @@ -102,7 +102,7 @@ StyledRect { Behavior on anchors.bottomMargin { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } @@ -120,7 +120,7 @@ StyledRect { Behavior on implicitHeight { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } diff --git a/modules/utilities/cards/Record.qml b/modules/utilities/cards/Record.qml index 97d88dde..dca2d375 100644 --- a/modules/utilities/cards/Record.qml +++ b/modules/utilities/cards/Record.qml @@ -132,14 +132,14 @@ StyledRect { property: "scale" to: 0.7 duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.standardAccel + easing: Tokens.anim.standardAccel } Anim { target: listOrControls property: "opacity" to: 0 duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.standardAccel + easing: Tokens.anim.standardAccel } } PropertyAction { @@ -159,14 +159,14 @@ StyledRect { property: "scale" to: 1 duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } Anim { target: listOrControls property: "opacity" to: 1 duration: Tokens.anim.durations.small - easing.bezierCurve: Tokens.anim.curves.standardDecel + easing: Tokens.anim.standardDecel } } } @@ -219,13 +219,13 @@ StyledRect { from: 1 to: 0 duration: Tokens.anim.durations.large - easing.bezierCurve: Tokens.anim.curves.emphasizedAccel + easing: Tokens.anim.emphasizedAccel } Anim { from: 0 to: 1 duration: Tokens.anim.durations.extraLarge - easing.bezierCurve: Tokens.anim.curves.emphasizedDecel + easing: Tokens.anim.emphasizedDecel } } } diff --git a/modules/utilities/cards/RecordingList.qml b/modules/utilities/cards/RecordingList.qml index 57b7ad64..210b92af 100644 --- a/modules/utilities/cards/RecordingList.qml +++ b/modules/utilities/cards/RecordingList.qml @@ -234,7 +234,7 @@ ColumnLayout { Behavior on implicitHeight { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } } diff --git a/modules/utilities/cards/Toggles.qml b/modules/utilities/cards/Toggles.qml index 65b5a627..41eee68f 100644 --- a/modules/utilities/cards/Toggles.qml +++ b/modules/utilities/cards/Toggles.qml @@ -159,12 +159,12 @@ StyledRect { inactiveColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 2) toggle: true radiusAnim.duration: Tokens.anim.durations.expressiveFastSpatial - radiusAnim.easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + radiusAnim.easing: Tokens.anim.expressiveFastSpatial Behavior on Layout.preferredWidth { Anim { duration: Tokens.anim.durations.expressiveFastSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial + easing: Tokens.anim.expressiveFastSpatial } } } diff --git a/modules/utilities/toasts/Toasts.qml b/modules/utilities/toasts/Toasts.qml index 7c15bf82..517175bf 100644 --- a/modules/utilities/toasts/Toasts.qml +++ b/modules/utilities/toasts/Toasts.qml @@ -112,7 +112,7 @@ Item { from: 0 to: 1 duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } ParallelAnimation { @@ -149,7 +149,7 @@ Item { Behavior on anchors.bottomMargin { Anim { duration: Tokens.anim.durations.expressiveDefaultSpatial - easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial + easing: Tokens.anim.expressiveDefaultSpatial } } }