diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/background/Wallpaper.qml | 3 | ||||
| -rw-r--r-- | modules/dashboard/Wrapper.qml | 6 | ||||
| -rw-r--r-- | modules/launcher/ContentList.qml | 3 | ||||
| -rw-r--r-- | modules/launcher/Wrapper.qml | 6 | ||||
| -rw-r--r-- | modules/notifications/Content.qml | 2 | ||||
| -rw-r--r-- | modules/notifications/Wrapper.qml | 33 | ||||
| -rw-r--r-- | modules/osd/Wrapper.qml | 6 | ||||
| -rw-r--r-- | modules/session/Wrapper.qml | 6 |
8 files changed, 21 insertions, 44 deletions
diff --git a/modules/background/Wallpaper.qml b/modules/background/Wallpaper.qml index af71da6..2734034 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 56662e7..684b409 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 62d5305..9818118 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 fb9bb06..4507032 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 341d66e..6e5e095 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 42f3acb..24aebd9 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 22d5f74..689f58c 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 0bf5183..2904db6 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 } } ] |