From 52cad36cdf4c6d8667e5e552dbec337a286ca97f Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Wed, 9 Jul 2025 19:04:38 +1000 Subject: internal: better anims Appear anims for osd and session from fast spatial -> default spatial Anim opacity for lock notif extra counter Fix extra counter (list not popups) --- modules/lock/Status.qml | 16 ++++++++++++++-- modules/osd/Wrapper.qml | 4 ++-- modules/session/Wrapper.qml | 8 ++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/modules/lock/Status.qml b/modules/lock/Status.qml index b93c4a1..a803c76 100644 --- a/modules/lock/Status.qml +++ b/modules/lock/Status.qml @@ -201,12 +201,16 @@ WrapperItem { move: Transition { Anim { property: "y" + duration: Appearance.anim.durations.large + easing.bezierCurve: Appearance.anim.curves.emphasized } } displaced: Transition { Anim { property: "y" + duration: Appearance.anim.durations.large + easing.bezierCurve: Appearance.anim.curves.emphasized } } @@ -221,16 +225,24 @@ WrapperItem { implicitWidth: count.implicitWidth + Appearance.padding.normal * 2 implicitHeight: count.implicitHeight + Appearance.padding.small * 2 - scale: Notifs.popups.length > Config.lock.maxNotifs ? 1 : 0 + opacity: Notifs.list.length > Config.lock.maxNotifs ? 1 : 0 + scale: Notifs.list.length > Config.lock.maxNotifs ? 1 : 0.8 StyledText { id: count anchors.centerIn: parent - text: qsTr("+%1").arg(Notifs.popups.length - Config.lock.maxNotifs) + text: qsTr("+%1").arg(Notifs.list.length - Config.lock.maxNotifs) color: Colours.palette.m3onTertiaryContainer } + Behavior on opacity { + Anim { + duration: Appearance.anim.durations.expressiveFastSpatial + easing.bezierCurve: Appearance.anim.curves.standard + } + } + Behavior on scale { Anim { duration: Appearance.anim.durations.expressiveFastSpatial diff --git a/modules/osd/Wrapper.qml b/modules/osd/Wrapper.qml index 2969002..90a890b 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.expressiveFastSpatial + duration: Appearance.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial } }, Transition { diff --git a/modules/session/Wrapper.qml b/modules/session/Wrapper.qml index db7105e..d37b1a9 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.expressiveFastSpatial + duration: Appearance.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial } }, Transition { @@ -41,9 +41,9 @@ Item { NumberAnimation { target: root property: "implicitWidth" - duration: root.visibilities.osd ? Appearance.anim.durations.expressiveFastSpatial : Appearance.anim.durations.normal + duration: root.visibilities.osd ? Appearance.anim.durations.normal : Appearance.anim.durations.normal easing.type: Easing.BezierSpline - easing.bezierCurve: root.visibilities.osd ? Appearance.anim.curves.expressiveFastSpatial : Appearance.anim.curves.emphasized + easing.bezierCurve: root.visibilities.osd ? Appearance.anim.curves.expressiveDefaultSpatial : Appearance.anim.curves.emphasized } } ] -- cgit v1.2.3-freya