tie transitions to reduced motion setting

5 months ago · f1ce494b74
parent 3b339a8007
commit f1ce494b74
12 changed files with 19 additions and 0 deletions
--- a/resources/qml/MatrixTextField.qml
+++ b/resources/qml/MatrixTextField.qml
@ -79,6 +79,7 @@ ColumnLayout {
                from: ""
                reversible: true
                to: "focused"
+                enabled: !Settings.reducedMotion

                NumberAnimation {
                    alwaysRunToEnd: true
@ -164,6 +165,7 @@ ColumnLayout {
                from: ""
                reversible: true
                to: "focused"
+                enabled: !Settings.reducedMotion

                NumberAnimation {
                    alwaysRunToEnd: true
--- a/resources/qml/MessageInput.qml
+++ b/resources/qml/MessageInput.qml
@ -335,6 +335,7 @@ Rectangle {
                    y: messageInput.positionToRectangle(messageInput.completerTriggeredAt).y - height

                    enter: Transition {
+                        enabled: !Settings.reducedMotion
                        NumberAnimation {
                            duration: 100
                            from: 0
@ -343,6 +344,7 @@ Rectangle {
                        }
                    }
                    exit: Transition {
+                        enabled: !Settings.reducedMotion
                        NumberAnimation {
                            duration: 100
                            from: 1
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@ -667,6 +667,7 @@ Item {
            from: ""
            reversible: true
            to: "shown"
+            enabled: !Settings.reducedMotion

            SequentialAnimation {
                PauseAnimation {
--- a/resources/qml/PrivacyScreen.qml
+++ b/resources/qml/PrivacyScreen.qml
@ -68,6 +68,7 @@ Item {
                from: "Invisible"
                reversible: true
                to: "Visible"
+                enabled: !Settings.reducedMotion

                SequentialAnimation {
                    NumberAnimation {
--- a/resources/qml/Root.qml
+++ b/resources/qml/Root.qml
@ -432,6 +432,7 @@ Pane {

        Transition {
            id: reducedMotionTransitionExit
+            enabled: !Settings.reducedMotion

            PropertyAnimation {
                duration: 200
@ -442,6 +443,7 @@ Pane {
        }
        Transition {
            id: reducedMotionTransitionEnter
+            enabled: !Settings.reducedMotion

            SequentialAnimation {
                PropertyAction {
--- a/resources/qml/TimelineBubbleMessageStyle.qml
+++ b/resources/qml/TimelineBubbleMessageStyle.qml
@ -107,6 +107,7 @@ TimelineEvent {
            transitions: Transition {
                from: ""
                to: "revealed"
+                enabled: !Settings.reducedMotion

                SequentialAnimation {
                    PropertyAnimation {
--- a/resources/qml/TimelineDefaultMessageStyle.qml
+++ b/resources/qml/TimelineDefaultMessageStyle.qml
@ -107,6 +107,7 @@ TimelineEvent {
            transitions: Transition {
                from: ""
                to: "revealed"
+                enabled: !Settings.reducedMotion

                SequentialAnimation {
                    PropertyAnimation {
--- a/resources/qml/ToggleButton.qml
+++ b/resources/qml/ToggleButton.qml
@ -5,6 +5,7 @@
 import QtQuick 2.5
 import QtQuick 2.12
 import QtQuick.Controls 2.12
+import im.nheko 1.0

 Switch {
    id: toggleButton
@ -66,6 +67,7 @@ Switch {
        Transition {
            reversible: true
            to: "off"
+            enabled: !Settings.reducedMotion

            ParallelAnimation {
                NumberAnimation {
--- a/resources/qml/delegates/ImageMessage.qml
+++ b/resources/qml/delegates/ImageMessage.qml
@ -72,6 +72,7 @@ AbstractButton {
            from: "ImageVisible"
            to: "BlurhashVisible"
            reversible: true
+            enabled: !Settings.reducedMotion

            SequentialAnimation {
                PropertyAction {
--- a/resources/qml/ui/RippleImpl.qml
+++ b/resources/qml/ui/RippleImpl.qml
@ -59,6 +59,7 @@ Item {
                    Transition {
                        from: "NORMAL"
                        to: "ACTIVE"
+                        enabled: !Settings.reducedMotion

                        SequentialAnimation {
                            //PropertyAction { target: circle; property: "centerX"; value: ph.point.position.x }
@ -87,6 +88,7 @@ Item {
                    Transition {
                        from: "ACTIVE"
                        to: "NORMAL"
+                        enabled: !Settings.reducedMotion

                        SequentialAnimation {
                            ParallelAnimation {
--- a/resources/qml/ui/Snackbar.qml
+++ b/resources/qml/ui/Snackbar.qml
@ -61,6 +61,7 @@ Popup {
    }

    enter: Transition {
+        enabled: !Settings.reducedMotion
        NumberAnimation {
            target: snackbar
            property: "opacity"
@ -79,6 +80,7 @@ Popup {
        }
    }
    exit: Transition {
+        enabled: !Settings.reducedMotion
        NumberAnimation {
            target: snackbar
            property: "opacity"
--- a/resources/qml/ui/media/MediaControls.qml
+++ b/resources/qml/ui/media/MediaControls.qml
@ -146,6 +146,7 @@ Rectangle {
                    Transition {
                        from: ""
                        to: "shown"
+                        enabled: !Settings.reducedMotion

                        SequentialAnimation {
                            PauseAnimation {
@ -163,6 +164,7 @@ Rectangle {
                    Transition {
                        from: "shown"
                        to: ""
+                        enabled: !Settings.reducedMotion

                        SequentialAnimation {
                            PauseAnimation {