From 6e8a32d4e40e25e1c077394f1638a43176ebf9ed Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Sun, 24 Aug 2025 17:22:00 +1000 Subject: [PATCH] internal: use Anim component --- components/containers/StyledFlickable.qml | 7 ++--- components/containers/StyledListView.qml | 7 ++--- components/controls/FilledSlider.qml | 10 +++---- components/controls/StyledBusyIndicator.qml | 5 ++-- components/controls/StyledScrollBar.qml | 6 +---- components/controls/StyledSwitch.qml | 12 +++------ components/controls/StyledTextField.qml | 4 +-- components/effects/Elevation.qml | 8 ++---- components/filedialog/CurrentItem.qml | 12 ++------- components/filedialog/Sidebar.qml | 6 +---- components/widgets/ExtraIndicator.qml | 7 ++--- modules/areapicker/Picker.qml | 17 ++++++------ modules/background/Wallpaper.qml | 5 +--- modules/bar/BarWrapper.qml | 8 +++--- modules/bar/components/ActiveWindow.qml | 10 ++----- modules/bar/components/StatusIcons.qml | 13 +++++----- modules/bar/components/Tray.qml | 21 ++++----------- .../components/workspaces/ActiveIndicator.qml | 14 +++++----- modules/bar/popouts/Audio.qml | 6 +---- modules/bar/popouts/Background.qml | 12 ++------- modules/bar/popouts/Battery.qml | 6 +---- modules/bar/popouts/TrayMenu.qml | 22 +++++----------- modules/bar/popouts/Wrapper.qml | 9 +------ modules/controlcenter/Panes.qml | 6 +---- modules/dashboard/Content.qml | 13 +++------- modules/dashboard/Performance.qml | 12 ++------- modules/dashboard/Tabs.qml | 6 +---- modules/dashboard/Wrapper.qml | 8 +++--- modules/dashboard/dash/Media.qml | 4 +-- modules/dashboard/dash/Resources.qml | 4 +-- modules/dashboard/dash/User.qml | 11 +++----- modules/drawers/Drawers.qml | 6 +---- modules/launcher/Content.qml | 8 ++---- modules/launcher/ContentList.qml | 26 +++++-------------- modules/launcher/Wrapper.qml | 8 +++--- modules/launcher/items/CalcItem.qml | 10 ++----- modules/lock/Center.qml | 6 ++--- modules/lock/Resources.qml | 4 +-- modules/notifications/Background.qml | 6 +---- modules/notifications/Notification.qml | 4 +-- modules/osd/Wrapper.qml | 9 +++---- modules/session/Wrapper.qml | 9 +++---- modules/utilities/Wrapper.qml | 8 +++--- modules/windowinfo/Buttons.qml | 6 +---- 44 files changed, 110 insertions(+), 291 deletions(-) diff --git a/components/containers/StyledFlickable.qml b/components/containers/StyledFlickable.qml index 7b2a75e9..bc6ae0f6 100644 --- a/components/containers/StyledFlickable.qml +++ b/components/containers/StyledFlickable.qml @@ -1,4 +1,4 @@ -import qs.config +import ".." import QtQuick Flickable { @@ -7,11 +7,8 @@ Flickable { maximumFlickVelocity: 3000 rebound: Transition { - NumberAnimation { + Anim { properties: "x,y" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } diff --git a/components/containers/StyledListView.qml b/components/containers/StyledListView.qml index b59eca8f..626d2063 100644 --- a/components/containers/StyledListView.qml +++ b/components/containers/StyledListView.qml @@ -1,4 +1,4 @@ -import qs.config +import ".." import QtQuick ListView { @@ -7,11 +7,8 @@ ListView { maximumFlickVelocity: 3000 rebound: Transition { - NumberAnimation { + Anim { properties: "x,y" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } diff --git a/components/controls/FilledSlider.qml b/components/controls/FilledSlider.qml index af60e9f3..4ddbfdab 100644 --- a/components/controls/FilledSlider.qml +++ b/components/controls/FilledSlider.qml @@ -80,25 +80,23 @@ Slider { Behavior on moving { SequentialAnimation { - NumberAnimation { + Anim { target: icon property: "scale" from: 1 to: 0 duration: Appearance.anim.durations.normal / 2 - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.standardAccel } ScriptAction { script: icon.update() } - NumberAnimation { + Anim { target: icon property: "scale" from: 0 to: 1 duration: Appearance.anim.durations.normal / 2 - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.standardDecel } } @@ -128,10 +126,8 @@ Slider { } Behavior on value { - NumberAnimation { + Anim { duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } diff --git a/components/controls/StyledBusyIndicator.qml b/components/controls/StyledBusyIndicator.qml index cc97c52d..9fd1c3e4 100644 --- a/components/controls/StyledBusyIndicator.qml +++ b/components/controls/StyledBusyIndicator.qml @@ -1,3 +1,4 @@ +import ".." import qs.services import qs.config import QtQuick @@ -39,11 +40,9 @@ BusyIndicator { } transitions: Transition { - NumberAnimation { + Anim { properties: "opacity,internalStrokeWidth" duration: updater.completeEndDuration - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } diff --git a/components/controls/StyledScrollBar.qml b/components/controls/StyledScrollBar.qml index 61ddc6d0..69a01f36 100644 --- a/components/controls/StyledScrollBar.qml +++ b/components/controls/StyledScrollBar.qml @@ -14,11 +14,7 @@ ScrollBar { color: Colours.palette.m3secondary Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } diff --git a/components/controls/StyledSwitch.qml b/components/controls/StyledSwitch.qml index af5c07d6..ecc1076f 100644 --- a/components/controls/StyledSwitch.qml +++ b/components/controls/StyledSwitch.qml @@ -39,7 +39,7 @@ Switch { opacity: root.pressed ? 0.1 : root.hovered ? 0.08 : 0 Behavior on opacity { - NumberAnim {} + Anim {} } } @@ -129,11 +129,11 @@ Switch { } Behavior on x { - NumberAnim {} + Anim {} } Behavior on implicitWidth { - NumberAnim {} + Anim {} } } } @@ -144,12 +144,6 @@ Switch { enabled: false } - component NumberAnim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - component PropAnim: PropertyAnimation { duration: Appearance.anim.durations.normal easing.type: Easing.BezierSpline diff --git a/components/controls/StyledTextField.qml b/components/controls/StyledTextField.qml index 78177993..4db87e95 100644 --- a/components/controls/StyledTextField.qml +++ b/components/controls/StyledTextField.qml @@ -60,10 +60,8 @@ TextField { } Behavior on opacity { - NumberAnimation { + Anim { duration: Appearance.anim.durations.small - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } diff --git a/components/effects/Elevation.qml b/components/effects/Elevation.qml index 999b199b..fb29f16e 100644 --- a/components/effects/Elevation.qml +++ b/components/effects/Elevation.qml @@ -1,5 +1,5 @@ +import ".." import qs.services -import qs.config import QtQuick import QtQuick.Effects @@ -13,10 +13,6 @@ RectangularShadow { offset.y: dp / 2 Behavior on dp { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } diff --git a/components/filedialog/CurrentItem.qml b/components/filedialog/CurrentItem.qml index bb4d55e2..c06c91f8 100644 --- a/components/filedialog/CurrentItem.qml +++ b/components/filedialog/CurrentItem.qml @@ -86,18 +86,10 @@ Item { Behavior on implicitWidth { enabled: !!root.currentItem - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } Behavior on implicitHeight { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } diff --git a/components/filedialog/Sidebar.qml b/components/filedialog/Sidebar.qml index e9a15bd9..b55d7b37 100644 --- a/components/filedialog/Sidebar.qml +++ b/components/filedialog/Sidebar.qml @@ -95,11 +95,7 @@ StyledRect { fill: place.selected ? 1 : 0 Behavior on fill { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } diff --git a/components/widgets/ExtraIndicator.qml b/components/widgets/ExtraIndicator.qml index 6034b330..db73ea08 100644 --- a/components/widgets/ExtraIndicator.qml +++ b/components/widgets/ExtraIndicator.qml @@ -37,17 +37,14 @@ StyledRect { } Behavior on opacity { - NumberAnimation { + Anim { duration: Appearance.anim.durations.expressiveFastSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } Behavior on scale { - NumberAnimation { + Anim { duration: Appearance.anim.durations.expressiveFastSpatial - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial } } diff --git a/modules/areapicker/Picker.qml b/modules/areapicker/Picker.qml index cd940474..0584b516 100644 --- a/modules/areapicker/Picker.qml +++ b/modules/areapicker/Picker.qml @@ -140,17 +140,17 @@ MouseArea { to: 0 duration: Appearance.anim.durations.large } - Anim { + ExAnim { target: root properties: "rsx,rsy" to: 0 } - Anim { + ExAnim { target: root property: "sw" to: root.screen.width } - Anim { + ExAnim { target: root property: "sh" to: root.screen.height @@ -256,30 +256,29 @@ MouseArea { Behavior on rsx { enabled: !root.pressed - Anim {} + ExAnim {} } Behavior on rsy { enabled: !root.pressed - Anim {} + ExAnim {} } Behavior on sw { enabled: !root.pressed - Anim {} + ExAnim {} } Behavior on sh { enabled: !root.pressed - Anim {} + ExAnim {} } - component Anim: NumberAnimation { + component ExAnim: Anim { duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial } } diff --git a/modules/background/Wallpaper.qml b/modules/background/Wallpaper.qml index a427d4fe..a4d99ee7 100644 --- a/modules/background/Wallpaper.qml +++ b/modules/background/Wallpaper.qml @@ -134,12 +134,9 @@ Item { } transitions: Transition { - NumberAnimation { + Anim { target: img properties: "opacity,scale" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } diff --git a/modules/bar/BarWrapper.qml b/modules/bar/BarWrapper.qml index c4ba52c8..cf9fa5a5 100644 --- a/modules/bar/BarWrapper.qml +++ b/modules/bar/BarWrapper.qml @@ -1,5 +1,6 @@ pragma ComponentBehavior: Bound +import qs.components import qs.config import "popouts" as BarPopouts import Quickshell @@ -43,11 +44,10 @@ Item { from: "" to: "visible" - NumberAnimation { + Anim { target: root property: "implicitWidth" duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial } }, @@ -55,11 +55,9 @@ Item { from: "visible" to: "" - NumberAnimation { + Anim { target: root property: "implicitWidth" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.emphasized } } diff --git a/modules/bar/components/ActiveWindow.qml b/modules/bar/components/ActiveWindow.qml index 3b897c06..28cf133a 100644 --- a/modules/bar/components/ActiveWindow.qml +++ b/modules/bar/components/ActiveWindow.qml @@ -61,9 +61,7 @@ Item { } Behavior on implicitHeight { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline + Anim { easing.bezierCurve: Appearance.anim.curves.emphasized } } @@ -90,11 +88,7 @@ Item { height: implicitWidth Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } } diff --git a/modules/bar/components/StatusIcons.qml b/modules/bar/components/StatusIcons.qml index 01284c6d..2a61e3f8 100644 --- a/modules/bar/components/StatusIcons.qml +++ b/modules/bar/components/StatusIcons.qml @@ -111,11 +111,13 @@ StyledRect { Anim { from: 1 to: 0 + duration: Appearance.anim.durations.large easing.bezierCurve: Appearance.anim.curves.standardAccel } Anim { from: 0 to: 1 + duration: Appearance.anim.durations.large easing.bezierCurve: Appearance.anim.curves.standardDecel } } @@ -156,7 +158,10 @@ StyledRect { } Behavior on implicitHeight { - Anim {} + Anim { + duration: Appearance.anim.durations.large + easing.bezierCurve: Appearance.anim.curves.emphasized + } } component WrappedLoader: Loader { @@ -166,10 +171,4 @@ StyledRect { asynchronous: true visible: active } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } } diff --git a/modules/bar/components/Tray.qml b/modules/bar/components/Tray.qml index df664d92..0477256e 100644 --- a/modules/bar/components/Tray.qml +++ b/modules/bar/components/Tray.qml @@ -25,29 +25,22 @@ StyledRect { spacing: Appearance.spacing.small add: Transition { - NumberAnimation { + Anim { properties: "scale" from: 0 to: 1 - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.standardDecel } } move: Transition { - NumberAnimation { + Anim { properties: "scale" to: 1 - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.standardDecel } - NumberAnimation { + Anim { properties: "x,y" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } @@ -61,17 +54,13 @@ StyledRect { } Behavior on implicitWidth { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline + Anim { easing.bezierCurve: Appearance.anim.curves.emphasized } } Behavior on implicitHeight { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline + Anim { easing.bezierCurve: Appearance.anim.curves.emphasized } } diff --git a/modules/bar/components/workspaces/ActiveIndicator.qml b/modules/bar/components/workspaces/ActiveIndicator.qml index fe5a3d01..3e265e20 100644 --- a/modules/bar/components/workspaces/ActiveIndicator.qml +++ b/modules/bar/components/workspaces/ActiveIndicator.qml @@ -63,13 +63,13 @@ StyledRect { Behavior on leading { enabled: Config.bar.workspaces.activeTrail - Anim {} + EAnim {} } Behavior on trailing { enabled: Config.bar.workspaces.activeTrail - Anim { + EAnim { duration: Appearance.anim.durations.normal * 2 } } @@ -77,24 +77,22 @@ StyledRect { Behavior on currentSize { enabled: Config.bar.workspaces.activeTrail - Anim {} + EAnim {} } Behavior on offset { enabled: !Config.bar.workspaces.activeTrail - Anim {} + EAnim {} } Behavior on size { enabled: !Config.bar.workspaces.activeTrail - Anim {} + EAnim {} } - component Anim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline + component EAnim: Anim { easing.bezierCurve: Appearance.anim.curves.emphasized } } diff --git a/modules/bar/popouts/Audio.qml b/modules/bar/popouts/Audio.qml index bb35af8a..fcc2a1eb 100644 --- a/modules/bar/popouts/Audio.qml +++ b/modules/bar/popouts/Audio.qml @@ -101,11 +101,7 @@ Item { onMoved: Audio.setVolume(value) Behavior on value { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } } diff --git a/modules/bar/popouts/Background.qml b/modules/bar/popouts/Background.qml index 9e78eeb4..075b6988 100644 --- a/modules/bar/popouts/Background.qml +++ b/modules/bar/popouts/Background.qml @@ -64,18 +64,10 @@ ShapePath { } Behavior on ibr { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } Behavior on sideRounding { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } diff --git a/modules/bar/popouts/Battery.qml b/modules/bar/popouts/Battery.qml index 08bb8140..35d32c56 100644 --- a/modules/bar/popouts/Battery.qml +++ b/modules/bar/popouts/Battery.qml @@ -224,11 +224,7 @@ Column { fill: profiles.current === text ? 1 : 0 Behavior on fill { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } } diff --git a/modules/bar/popouts/TrayMenu.qml b/modules/bar/popouts/TrayMenu.qml index 67305b59..986c8061 100644 --- a/modules/bar/popouts/TrayMenu.qml +++ b/modules/bar/popouts/TrayMenu.qml @@ -22,10 +22,10 @@ StackView { handle: root.trayItem } - pushEnter: Anim {} - pushExit: Anim {} - popEnter: Anim {} - popExit: Anim {} + pushEnter: NoAnim {} + pushExit: NoAnim {} + popEnter: NoAnim {} + popExit: NoAnim {} HyprlandFocusGrab { active: true @@ -33,7 +33,7 @@ StackView { onCleared: root.popouts.hasCurrent = false } - component Anim: Transition { + component NoAnim: Transition { NumberAnimation { duration: 0 } @@ -58,19 +58,11 @@ StackView { StackView.onRemoved: destroy() Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } Behavior on scale { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } QsMenuOpener { diff --git a/modules/bar/popouts/Wrapper.qml b/modules/bar/popouts/Wrapper.qml index 845826d5..20f4c5b1 100644 --- a/modules/bar/popouts/Wrapper.qml +++ b/modules/bar/popouts/Wrapper.qml @@ -1,5 +1,6 @@ pragma ComponentBehavior: Bound +import qs.components import qs.services import qs.config import qs.modules.windowinfo @@ -170,7 +171,6 @@ Item { } Anim { property: "opacity" - easing.bezierCurve: Appearance.anim.curves.standard } } }, @@ -181,7 +181,6 @@ Item { SequentialAnimation { Anim { property: "opacity" - easing.bezierCurve: Appearance.anim.curves.standard } PropertyAction { property: "active" @@ -190,10 +189,4 @@ Item { } ] } - - component Anim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.emphasized - } } diff --git a/modules/controlcenter/Panes.qml b/modules/controlcenter/Panes.qml index f60d0c69..2548c3d9 100644 --- a/modules/controlcenter/Panes.qml +++ b/modules/controlcenter/Panes.qml @@ -55,11 +55,7 @@ ClippingRectangle { } Behavior on y { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } diff --git a/modules/dashboard/Content.qml b/modules/dashboard/Content.qml index a48d0986..05003b59 100644 --- a/modules/dashboard/Content.qml +++ b/modules/dashboard/Content.qml @@ -1,5 +1,6 @@ pragma ComponentBehavior: Bound +import qs.components import qs.config import Quickshell import Quickshell.Widgets @@ -101,27 +102,21 @@ Item { } Behavior on contentX { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } } Behavior on implicitWidth { - NumberAnimation { + Anim { duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.emphasized } } Behavior on implicitHeight { - NumberAnimation { + Anim { duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.emphasized } } diff --git a/modules/dashboard/Performance.qml b/modules/dashboard/Performance.qml index e29b0eb1..5e00d892 100644 --- a/modules/dashboard/Performance.qml +++ b/modules/dashboard/Performance.qml @@ -201,19 +201,11 @@ RowLayout { } Behavior on value1 { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } Behavior on value2 { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } Behavior on fg1 { diff --git a/modules/dashboard/Tabs.qml b/modules/dashboard/Tabs.qml index d9230525..aecb4fa1 100644 --- a/modules/dashboard/Tabs.qml +++ b/modules/dashboard/Tabs.qml @@ -224,11 +224,7 @@ Item { font.pointSize: Appearance.font.size.large Behavior on fill { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } diff --git a/modules/dashboard/Wrapper.qml b/modules/dashboard/Wrapper.qml index 1a547c9f..befc8598 100644 --- a/modules/dashboard/Wrapper.qml +++ b/modules/dashboard/Wrapper.qml @@ -1,5 +1,6 @@ pragma ComponentBehavior: Bound +import qs.components import qs.components.filedialog import qs.config import qs.utils @@ -43,11 +44,10 @@ Item { from: "" to: "visible" - NumberAnimation { + Anim { target: root property: "implicitHeight" duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial } }, @@ -55,11 +55,9 @@ Item { from: "visible" to: "" - NumberAnimation { + Anim { target: root property: "implicitHeight" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.emphasized } } diff --git a/modules/dashboard/dash/Media.qml b/modules/dashboard/dash/Media.qml index 5daa5817..eda44d53 100644 --- a/modules/dashboard/dash/Media.qml +++ b/modules/dashboard/dash/Media.qml @@ -18,10 +18,8 @@ Item { implicitWidth: Config.dashboard.sizes.mediaWidth Behavior on playerProgress { - NumberAnimation { + Anim { duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } diff --git a/modules/dashboard/dash/Resources.qml b/modules/dashboard/dash/Resources.qml index 326bfb7b..7f44a9d0 100644 --- a/modules/dashboard/dash/Resources.qml +++ b/modules/dashboard/dash/Resources.qml @@ -79,10 +79,8 @@ Row { } Behavior on value { - NumberAnimation { + Anim { duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } diff --git a/modules/dashboard/dash/User.qml b/modules/dashboard/dash/User.qml index acb56459..2576e3ee 100644 --- a/modules/dashboard/dash/User.qml +++ b/modules/dashboard/dash/User.qml @@ -50,10 +50,8 @@ Row { opacity: parent.containsMouse ? 1 : 0 Behavior on opacity { - NumberAnimation { + Anim { duration: Appearance.anim.durations.expressiveFastSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } @@ -90,18 +88,15 @@ Row { } Behavior on scale { - NumberAnimation { + Anim { duration: Appearance.anim.durations.expressiveFastSpatial - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial } } Behavior on opacity { - NumberAnimation { + Anim { duration: Appearance.anim.durations.expressiveFastSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } diff --git a/modules/drawers/Drawers.qml b/modules/drawers/Drawers.qml index 06183ddc..b40eabe8 100644 --- a/modules/drawers/Drawers.qml +++ b/modules/drawers/Drawers.qml @@ -78,11 +78,7 @@ Variants { color: Colours.palette.m3scrim Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } diff --git a/modules/launcher/Content.qml b/modules/launcher/Content.qml index a8d84220..7158cddb 100644 --- a/modules/launcher/Content.qml +++ b/modules/launcher/Content.qml @@ -182,18 +182,14 @@ Item { } Behavior on width { - NumberAnimation { + Anim { duration: Appearance.anim.durations.small - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } Behavior on opacity { - NumberAnimation { + Anim { duration: Appearance.anim.durations.small - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml index d426d589..2eaa5151 100644 --- a/modules/launcher/ContentList.qml +++ b/modules/launcher/ContentList.qml @@ -55,24 +55,20 @@ Item { Behavior on state { SequentialAnimation { - NumberAnimation { + Anim { target: root property: "opacity" from: 1 to: 0 duration: Appearance.anim.durations.small - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } PropertyAction {} - NumberAnimation { + Anim { target: root property: "opacity" from: 0 to: 1 duration: Appearance.anim.durations.small - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } @@ -148,28 +144,19 @@ Item { } Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } Behavior on scale { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } Behavior on implicitWidth { enabled: root.visibilities.launcher - NumberAnimation { + Anim { duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.emphasizedDecel } } @@ -177,9 +164,8 @@ Item { Behavior on implicitHeight { enabled: root.visibilities.launcher - NumberAnimation { + Anim { duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.emphasizedDecel } } diff --git a/modules/launcher/Wrapper.qml b/modules/launcher/Wrapper.qml index f1ab6723..d977b071 100644 --- a/modules/launcher/Wrapper.qml +++ b/modules/launcher/Wrapper.qml @@ -1,3 +1,4 @@ +import qs.components import qs.config import Quickshell import QtQuick @@ -26,11 +27,10 @@ Item { from: "" to: "visible" - NumberAnimation { + Anim { target: root property: "implicitHeight" duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial } }, @@ -38,11 +38,9 @@ Item { from: "visible" to: "" - NumberAnimation { + Anim { target: root property: "implicitHeight" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.emphasized } } diff --git a/modules/launcher/items/CalcItem.qml b/modules/launcher/items/CalcItem.qml index 5e578d84..211ac61f 100644 --- a/modules/launcher/items/CalcItem.qml +++ b/modules/launcher/items/CalcItem.qml @@ -130,11 +130,7 @@ Item { opacity: stateLayer.containsMouse ? 1 : 0 Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } @@ -151,9 +147,7 @@ Item { } Behavior on implicitWidth { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline + Anim { easing.bezierCurve: Appearance.anim.curves.emphasized } } diff --git a/modules/lock/Center.qml b/modules/lock/Center.qml index ae18ed80..02e069af 100644 --- a/modules/lock/Center.qml +++ b/modules/lock/Center.qml @@ -309,10 +309,10 @@ ColumnLayout { loops: 2 - MessageAnim { + FlashAnim { to: 0.3 } - MessageAnim { + FlashAnim { to: 1 } } @@ -335,7 +335,7 @@ ColumnLayout { } } - component MessageAnim: NumberAnimation { + component FlashAnim: NumberAnimation { target: message property: "opacity" duration: Appearance.anim.durations.small diff --git a/modules/lock/Resources.qml b/modules/lock/Resources.qml index 7dda2186..82c004c2 100644 --- a/modules/lock/Resources.qml +++ b/modules/lock/Resources.qml @@ -85,10 +85,8 @@ GridLayout { } Behavior on value { - NumberAnimation { + Anim { duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } diff --git a/modules/notifications/Background.qml b/modules/notifications/Background.qml index 215012fd..47ec54a3 100644 --- a/modules/notifications/Background.qml +++ b/modules/notifications/Background.qml @@ -54,10 +54,6 @@ ShapePath { } Behavior on fullHeightRounding { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } diff --git a/modules/notifications/Notification.qml b/modules/notifications/Notification.qml index cc691f44..1a0ec050 100644 --- a/modules/notifications/Notification.qml +++ b/modules/notifications/Notification.qml @@ -29,9 +29,7 @@ StyledRect { Component.onCompleted: x = 0 Behavior on x { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline + Anim { easing.bezierCurve: Appearance.anim.curves.emphasizedDecel } } diff --git a/modules/osd/Wrapper.qml b/modules/osd/Wrapper.qml index e99bea6a..c1e96d6e 100644 --- a/modules/osd/Wrapper.qml +++ b/modules/osd/Wrapper.qml @@ -1,3 +1,4 @@ +import qs.components import qs.services import qs.config import Quickshell @@ -27,11 +28,9 @@ Item { from: "" to: "visible" - NumberAnimation { + Anim { target: root property: "implicitWidth" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial } }, @@ -39,11 +38,9 @@ Item { from: "visible" to: "" - NumberAnimation { + Anim { target: root property: "implicitWidth" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.emphasized } } diff --git a/modules/session/Wrapper.qml b/modules/session/Wrapper.qml index ee485a9e..facb0ff7 100644 --- a/modules/session/Wrapper.qml +++ b/modules/session/Wrapper.qml @@ -1,3 +1,4 @@ +import qs.components import qs.config import Quickshell import QtQuick @@ -25,11 +26,9 @@ Item { from: "" to: "visible" - NumberAnimation { + Anim { target: root property: "implicitWidth" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial } }, @@ -37,11 +36,9 @@ Item { from: "visible" to: "" - NumberAnimation { + Anim { target: root property: "implicitWidth" - duration: root.visibilities.osd ? Appearance.anim.durations.normal : Appearance.anim.durations.normal - easing.type: Easing.BezierSpline easing.bezierCurve: root.visibilities.osd ? Appearance.anim.curves.expressiveDefaultSpatial : Appearance.anim.curves.emphasized } } diff --git a/modules/utilities/Wrapper.qml b/modules/utilities/Wrapper.qml index c0f10e1b..1da4c676 100644 --- a/modules/utilities/Wrapper.qml +++ b/modules/utilities/Wrapper.qml @@ -1,3 +1,4 @@ +import qs.components import qs.config import QtQuick @@ -24,11 +25,10 @@ Item { from: "" to: "visible" - NumberAnimation { + Anim { target: root property: "implicitHeight" duration: Appearance.anim.durations.expressiveDefaultSpatial - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial } }, @@ -36,11 +36,9 @@ Item { from: "visible" to: "" - NumberAnimation { + Anim { target: root property: "implicitHeight" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.emphasized } } diff --git a/modules/windowinfo/Buttons.qml b/modules/windowinfo/Buttons.qml index 7cb767e6..d7ef095b 100644 --- a/modules/windowinfo/Buttons.qml +++ b/modules/windowinfo/Buttons.qml @@ -94,11 +94,7 @@ ColumnLayout { } Behavior on Layout.preferredHeight { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } }