Animators are buggy crap, drop them

src/qml/Base/HBox.qml

@@ -32,7 +32,7 @@ Rectangle {
     }
 
 
-    HScaleAnimator on scale {
+    HNumberAnimation on scale {
         running: true
         from: 0
         to: 1

src/qml/Base/HButtonBackground.qml

@@ -11,7 +11,7 @@ Rectangle {
     property QtObject buttonTheme
 
 
-    Behavior on opacity { HOpacityAnimator {} }
+    Behavior on opacity { HNumberAnimation {} }
 
 
     Rectangle {

src/qml/Base/HButtonContent.qml

@@ -16,60 +16,8 @@ HRowLayout {
     readonly property alias label: label
 
 
-    Behavior on opacity { HOpacityAnimator {} }
+    Behavior on opacity { HNumberAnimation {} }
 
-    Item {
-        id: iconWrapper
-
-        Layout.alignment: Qt.AlignCenter
-        Layout.preferredWidth: icon.width
-        Layout.preferredHeight: icon.height
-
-        ParallelAnimation {
-            id: resetAnimations
-            HOpacityAnimator { target: iconWrapper; to: 1 }
-            HRotationAnimator { target: iconWrapper; to: 0 }
-        }
-
-        HOpacityAnimator {
-            id: blink
-            target: iconWrapper
-            from: 1
-            to: 0.5
-            factor: 2
-            running: button.loading || false
-            onFinished: {
-                if (button.loading) { [from, to] = [to, from]; start() }
-            }
-        }
-
-        SequentialAnimation {
-            running: button.loading || false
-            loops: Animation.Infinite
-            onStopped: resetAnimations.start()
-
-            HPauseAnimation { factor: blink.factor * 8 }
-
-            // These don't work directly on HIcon, hence why we wrap it in
-            // an Item. Qt bug? (5.13.1_1)
-            HRotationAnimator {
-                id: rotation1
-                target: iconWrapper
-                from: 0
-                to: 180
-                factor: blink.factor
-            }
-
-            HPauseAnimation { factor: blink.factor * 8 }
-
-            HRotationAnimator {
-                target: rotation1.target
-                from: rotation1.to
-                to: 360
-                factor: rotation1.factor
-                direction: RotationAnimator.Clockwise
-            }
-        }
 
     HIcon {
         property bool loading: button.loading || false
@@ -79,8 +27,52 @@ HRowLayout {
         colorize: enabled ? button.icon.color: theme.icons.disabledColorize
         cache: button.icon.cache
 
+        onLoadingChanged: if (! loading) resetAnimations.start()
+
         Layout.fillHeight: true
         Layout.alignment: Qt.AlignCenter
+
+
+        ParallelAnimation {
+            id: resetAnimations
+            HNumberAnimation { target: icon; property: "opacity"; to: 1 }
+            HNumberAnimation { target: icon; property: "rotation"; to: 0 }
+        }
+
+
+        HNumberAnimation on opacity {
+            id: blink
+            from: 1
+            to: 0.5
+            factor: 2
+            running: button.loading || false
+            onFinished: { [from, to] = [to, from]; start() }
+        }
+
+        SequentialAnimation {
+            running: button.loading || false
+            loops: Animation.Infinite
+
+            HPauseAnimation { factor: blink.factor * 8 }
+
+            HNumberAnimation {
+                id: rotation1
+                target: icon
+                property: "rotation"
+                from: 0
+                to: 180
+                factor: blink.factor
+            }
+
+            HPauseAnimation { factor: blink.factor * 8 }
+
+            HNumberAnimation {
+                target: rotation1.target
+                property: rotation1.property
+                from: rotation1.to
+                to: 360
+                factor: rotation1.factor
+            }
         }
     }
 
@@ -93,7 +85,6 @@ HRowLayout {
         verticalAlignment: Text.AlignVCenter
         elide: Text.ElideRight
 
-        Layout.alignment: Qt.AlignCenter
         Layout.fillWidth: true
         Layout.fillHeight: true
     }

src/qml/Base/HCheckBox.qml

@@ -37,7 +37,6 @@ CheckBox {
 
             scale: box.checked ? 1 : 0
 
-            // FIXME: HScaleAnimator won't work here?
             Behavior on scale {
                 HNumberAnimation {
                     overshoot: 4
@@ -88,5 +87,5 @@ CheckBox {
     function reset() { checked = defaultChecked }
 
 
-    Behavior on opacity { HOpacityAnimator { factor: 2 } }
+    Behavior on opacity { HNumberAnimation { factor: 2 } }
 }

src/qml/Base/HCircleProgressBar.qml

@@ -38,7 +38,7 @@ RadialBar {
         when: bar.indeterminate
     }
 
-    RotationAnimator on rotation {
+    HNumberAnimation on rotation {
         running: bar.indeterminate
         from: 0
         to: 360

src/qml/Base/HImage.qml

@@ -56,7 +56,7 @@ Image {
                 )
                 scale: parent.status === Image.Ready && parent.paused ? 1 : 0
 
-                Behavior on scale { HScaleAnimator { overshoot: 4 } }
+                Behavior on scale { HNumberAnimation { overshoot: 4 } }
             }
         }
     }

src/qml/Base/HOpacityAnimator.qml

@@ -1,7 +0,0 @@
-import QtQuick 2.12
-
-OpacityAnimator {
-    duration: theme.animationDuration * factor
-
-    property real factor: 1.0
-}

src/qml/Base/HPopup.qml

@@ -10,11 +10,10 @@ Popup {
     margins: theme.spacing
 
     enter: Transition {
-        HScaleAnimator { from: 0; to: 1; overshoot: 4 }
+        HNumberAnimation { property: "scale"; from: 0; to: 1; overshoot: 4 }
     }
 
     exit: Transition {
-        // FIXME: HScaleAnimator won't work here?
         HNumberAnimation { property: "scale"; to: 0 }
     }
 

src/qml/Base/HProgressBar.qml

@@ -26,7 +26,7 @@ ProgressBar {
 
             Behavior on color { HColorAnimation {} }
 
-            XAnimator on x {
+            HNumberAnimation on x {
                 running: bar.indeterminate
                 duration: theme.animationDuration * 8
                 from: 0

src/qml/Base/HRotationAnimator.qml

@@ -1,7 +0,0 @@
-import QtQuick 2.12
-
-RotationAnimator {
-    duration: theme.animationDuration * factor
-
-    property real factor: 1.0
-}

src/qml/Base/HScaleAnimator.qml

@@ -1,10 +0,0 @@
-import QtQuick 2.12
-
-ScaleAnimator {
-    property real factor: 1.0
-    property real overshoot: 1.0
-
-    duration: theme.animationDuration * Math.max(overshoot / 1.7, 1.0) * factor
-    easing.type: overshoot > 1 ? Easing.OutBack : Easing.Linear
-    easing.overshoot: overshoot
-}

src/qml/Base/HScrollableTextArea.qml

@@ -38,7 +38,7 @@ ScrollView {
     function reset() { area.clear(); text = defaultText }
 
 
-    Behavior on opacity { HOpacityAnimator {} }
+    Behavior on opacity { HNumberAnimation {} }
 
     TextArea {
         id: textArea
@@ -102,7 +102,7 @@ ScrollView {
             font.family: parent.font.family
             font.pixelSize: parent.font.pixelSize
 
-            Behavior on opacity { HOpacityAnimator {} }
+            Behavior on opacity { HNumberAnimation {} }
         }
     }
 }

src/qml/Base/HTextField.qml

@@ -80,7 +80,7 @@ TextField {
         when: disabledText !== null && ! field.enabled
     }
 
-    Behavior on opacity { HOpacityAnimator {} }
+    Behavior on opacity { HNumberAnimation {} }
     Behavior on color { HColorAnimation {} }
     Behavior on placeholderTextColor { HColorAnimation {} }
 
@@ -99,6 +99,6 @@ TextField {
         font.family: parent.font.family
         font.pixelSize: parent.font.pixelSize
 
-        Behavior on opacity { HOpacityAnimator {} }
+        Behavior on opacity { HNumberAnimation {} }
     }
 }

src/qml/Base/HToolTip.qml

@@ -41,7 +41,6 @@ ToolTip {
         }
     }
 
-    // FIXME: HOpacityAnimator won't work for these?
     enter: Transition {
         HNumberAnimation { property: "opacity"; from: 0.0; to: 1.0 }
     }

src/qml/Base/HXAnimator.qml

@@ -1,7 +0,0 @@
-import QtQuick 2.12
-
-XAnimator {
-    duration: theme.animationDuration * factor
-
-    property real factor: 1.0
-}

src/qml/Base/HYAnimator.qml

@@ -1,7 +0,0 @@
-import QtQuick 2.12
-
-YAnimator {
-    duration: theme.animationDuration * factor
-
-    property real factor: 1.0
-}

src/qml/Chat/Chat.qml

@@ -44,7 +44,7 @@ Item {
             source: opacity > 0 ? "../Base/HBusyIndicator.qml" : ""
             opacity: ready ? 0 : 1
 
-            Behavior on opacity { HOpacityAnimator { factor: 2 } }
+            Behavior on opacity { HNumberAnimation { factor: 2 } }
         }
     }
 

src/qml/Chat/RoomPane/MemberView.qml

@@ -60,7 +60,7 @@ HColumnLayout {
             Layout.fillWidth: true
             Layout.fillHeight: true
 
-            Behavior on opacity { HOpacityAnimator {} }
+            Behavior on opacity { HNumberAnimation {} }
         }
 
         HButton {

src/qml/Chat/Timeline/EventDelegate.qml

@@ -102,7 +102,7 @@ Column {
         id: eventContent
         width: parent.width
 
-        Behavior on x { HXAnimator {} }
+        Behavior on x { HNumberAnimation {} }
     }
 
 

src/qml/Chat/Timeline/EventImage.qml

@@ -96,7 +96,7 @@ HMxcImage {
         opacity: hover.hovered ? 0 : 1
         visible: opacity > 0
 
-        Behavior on opacity { HOpacityAnimator {} }
+        Behavior on opacity { HNumberAnimation {} }
     }
 
     EventImageTextBubble {
@@ -107,6 +107,6 @@ HMxcImage {
         opacity: hover.hovered ? 0 : 1
         visible: opacity > 0
 
-        Behavior on opacity { HOpacityAnimator {} }
+        Behavior on opacity { HNumberAnimation {} }
     }
 }

src/qml/MainPane/AccountDelegate.qml

@@ -20,7 +20,7 @@ HTileDelegate {
         ! mainPaneList.activateLimiter.running && ! mainPane.hasFocus
 
 
-    Behavior on opacity { HOpacityAnimator {} }
+    Behavior on opacity { HNumberAnimation {} }
 
 
     readonly property bool forceExpand: Boolean(mainPaneList.filter)
@@ -71,7 +71,7 @@ HTileDelegate {
 
         Layout.fillHeight: true
 
-        Behavior on opacity { HOpacityAnimator {} }
+        Behavior on opacity { HNumberAnimation {} }
     }
 
     HButton {
@@ -99,7 +99,7 @@ HTileDelegate {
             Behavior on angle { HNumberAnimation {} }
         }
 
-        Behavior on opacity { HOpacityAnimator {} }
+        Behavior on opacity { HNumberAnimation {} }
     }
 
     contextMenu: HMenu {

src/qml/MainPane/MainPane.qml

@@ -26,7 +26,7 @@ HDrawer {
     }
 
 
-    Behavior on opacity { HOpacityAnimator {} }
+    Behavior on opacity { HNumberAnimation {} }
 
     Binding on visible {
         value: false

src/qml/MainPane/MainPaneToolBar.qml

@@ -53,6 +53,6 @@ HRowLayout {
             mainUI.pageLoader.forceActiveFocus()
         }
 
-        Behavior on opacity { HOpacityAnimator {} }
+        Behavior on opacity { HNumberAnimation {} }
     }
 }

src/qml/MainPane/RoomDelegate.qml

@@ -18,7 +18,7 @@ HTileDelegate {
         ! mainPaneList.activateLimiter.running && ! mainPane.hasFocus
 
 
-    Behavior on opacity { HOpacityAnimator {} }
+    Behavior on opacity { HNumberAnimation {} }
 
 
     readonly property bool joined: ! invited && ! parted

src/qml/Pages/AccountSettings/Profile.qml

@@ -81,7 +81,7 @@ HGridLayout {
                 (! avatar.mxc && overlayHover.hovered) ? 0.8 : 0.7
             )
 
-            Behavior on opacity { HOpacityAnimator {} }
+            Behavior on opacity { HNumberAnimation {} }
             Behavior on color { HColorAnimation {} }
 
             HoverHandler { id: overlayHover }

src/qml/Pages/AddChat/CreateRoom.qml

@@ -67,7 +67,7 @@ HBox {
             opacity: nameField.text ? 0 : 1
             visible: opacity > 0
 
-            Behavior on opacity { HOpacityAnimator {} }
+            Behavior on opacity { HNumberAnimation {} }
         }
     }
 

src/qml/UI.qml

@@ -20,8 +20,12 @@ Item {
 
     SequentialAnimation {
         id: pressAnimation
-        HScaleAnimator { target: mainUI; from: 1.0; to: 0.9 }
+        HNumberAnimation {
-        HScaleAnimator { target: mainUI; from: 0.9; to: 1.0 }
+            target: mainUI; property: "scale";  from: 1.0; to: 0.9
+        }
+        HNumberAnimation {
+            target: mainUI; property: "scale";  from: 0.9; to: 1.0
+        }
     }
 
     property bool accountsPresent:
@@ -134,9 +138,10 @@ Item {
         }
 
 
-        XAnimator {
+        HNumberAnimation {
             id: appearAnimation
             target: pageLoader.item
+            property: "x"
             from: -300
             to: 0
             easing.type: Easing.OutBack

src/qml/Window.qml

@@ -89,6 +89,6 @@ ApplicationWindow {
         scale: py.ready ? 1 : 0.5
         source: py.ready ? (Qt.application.arguments[1] || "UI.qml") : ""
 
-        Behavior on scale { HScaleAnimator { overshoot: 5; factor: 1.2 } }
+        Behavior on scale { HNumberAnimation { overshoot: 5; factor: 1.2 } }
     }
 }