internal: use Anim component

10 files changed, 34 insertions, 87 deletions

diff --git a/modules/bar/BarWrapper.qml b/modules/bar/BarWrapper.qml
index c4ba52c..cf9fa5a 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 3b897c0..28cf133 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 01284c6..2a61e3f 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 df664d9..0477256 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 fe5a3d0..3e265e2 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 bb35af8..fcc2a1e 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 9e78eeb..075b698 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 08bb814..35d32c5 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 67305b5..986c806 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 845826d..20f4c5b 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
-    }
 }