internal: use Anim component

4 files changed, 19 insertions, 39 deletions

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
     }
 }