diff --git a/config/Appearance.qml b/config/Appearance.qml index 633f2732..fafca051 100644 --- a/config/Appearance.qml +++ b/config/Appearance.qml @@ -62,6 +62,9 @@ Singleton { readonly property list standard: [0.2, 0, 0, 1, 1, 1] readonly property list standardAccel: [0.3, 0, 1, 1, 1, 1] readonly property list standardDecel: [0, 0, 0, 1, 1, 1] + readonly property list expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1] + readonly property list expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1] + readonly property list expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1] } component AnimDurations: QtObject { diff --git a/modules/background/Wallpaper.qml b/modules/background/Wallpaper.qml index af71da62..27340349 100644 --- a/modules/background/Wallpaper.qml +++ b/modules/background/Wallpaper.qml @@ -65,9 +65,6 @@ Item { } transitions: Transition { - from: "*" - to: "*" - NumberAnimation { target: img properties: "opacity,scale" diff --git a/modules/dashboard/Wrapper.qml b/modules/dashboard/Wrapper.qml index 56662e75..684b4098 100644 --- a/modules/dashboard/Wrapper.qml +++ b/modules/dashboard/Wrapper.qml @@ -28,9 +28,9 @@ Item { NumberAnimation { target: root property: "implicitHeight" - duration: Appearance.anim.durations.large + duration: Appearance.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasizedDecel + easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial } }, Transition { @@ -42,7 +42,7 @@ Item { property: "implicitHeight" duration: Appearance.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasizedAccel + easing.bezierCurve: Appearance.anim.curves.emphasized } } ] diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml index 62d5305a..98181180 100644 --- a/modules/launcher/ContentList.qml +++ b/modules/launcher/ContentList.qml @@ -51,9 +51,6 @@ Item { ] transitions: Transition { - from: "*" - to: "*" - SequentialAnimation { NumberAnimation { target: root diff --git a/modules/launcher/Wrapper.qml b/modules/launcher/Wrapper.qml index fb9bb060..45070322 100644 --- a/modules/launcher/Wrapper.qml +++ b/modules/launcher/Wrapper.qml @@ -28,9 +28,9 @@ Item { NumberAnimation { target: root property: "implicitHeight" - duration: Appearance.anim.durations.large + duration: Appearance.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasizedDecel + easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial } }, Transition { @@ -42,7 +42,7 @@ Item { property: "implicitHeight" duration: Appearance.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasizedAccel + easing.bezierCurve: Appearance.anim.curves.emphasized } } ] diff --git a/modules/notifications/Content.qml b/modules/notifications/Content.qml index 341d66e7..6e5e095b 100644 --- a/modules/notifications/Content.qml +++ b/modules/notifications/Content.qml @@ -102,6 +102,6 @@ Item { component Anim: NumberAnimation { duration: Appearance.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard + easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial } } diff --git a/modules/notifications/Wrapper.qml b/modules/notifications/Wrapper.qml index 42f3acb9..24aebd96 100644 --- a/modules/notifications/Wrapper.qml +++ b/modules/notifications/Wrapper.qml @@ -20,32 +20,15 @@ Item { } } - transitions: [ - Transition { - from: "" - to: "visible" - - NumberAnimation { - target: root - property: "implicitHeight" - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasizedDecel - } - }, - Transition { - from: "visible" - to: "" - - NumberAnimation { - target: root - property: "implicitHeight" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + transitions: Transition { + NumberAnimation { + target: root + property: "implicitHeight" + duration: Appearance.anim.durations.normal + easing.type: Easing.BezierSpline + easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial } - ] + } Content { id: content diff --git a/modules/osd/Wrapper.qml b/modules/osd/Wrapper.qml index 22d5f744..689f58cf 100644 --- a/modules/osd/Wrapper.qml +++ b/modules/osd/Wrapper.qml @@ -30,9 +30,9 @@ Item { NumberAnimation { target: root property: "implicitWidth" - duration: Appearance.anim.durations.large + duration: Appearance.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasizedDecel + easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial } }, Transition { @@ -44,7 +44,7 @@ Item { property: "implicitWidth" duration: Appearance.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasizedAccel + easing.bezierCurve: Appearance.anim.curves.emphasized } } ] diff --git a/modules/session/Wrapper.qml b/modules/session/Wrapper.qml index 0bf5183f..2904db6f 100644 --- a/modules/session/Wrapper.qml +++ b/modules/session/Wrapper.qml @@ -29,9 +29,9 @@ Item { NumberAnimation { target: root property: "implicitWidth" - duration: Appearance.anim.durations.large + duration: Appearance.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasizedDecel + easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial } }, Transition { @@ -43,7 +43,7 @@ Item { property: "implicitWidth" duration: Appearance.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasizedAccel + easing.bezierCurve: root.visibilities.osd ? Appearance.anim.curves.expressiveFastSpatial : Appearance.anim.curves.emphasized } } ] diff --git a/widgets/VerticalSlider.qml b/widgets/VerticalSlider.qml index 77afe3bd..3ee2d476 100644 --- a/widgets/VerticalSlider.qml +++ b/widgets/VerticalSlider.qml @@ -81,9 +81,6 @@ Slider { } transitions: Transition { - from: "*" - to: "*" - NumberAnimation { target: icon property: "scale"