From f1ce494b74b8c3f79da0cc5e1e52a7f54b7a9a69 Mon Sep 17 00:00:00 2001 From: Karthik Nishanth Date: Sun, 23 Jun 2024 18:24:39 -0700 Subject: [PATCH] tie transitions to reduced motion setting --- resources/qml/MatrixTextField.qml | 2 ++ resources/qml/MessageInput.qml | 2 ++ resources/qml/MessageView.qml | 1 + resources/qml/PrivacyScreen.qml | 1 + resources/qml/Root.qml | 2 ++ resources/qml/TimelineBubbleMessageStyle.qml | 1 + resources/qml/TimelineDefaultMessageStyle.qml | 1 + resources/qml/ToggleButton.qml | 2 ++ resources/qml/delegates/ImageMessage.qml | 1 + resources/qml/ui/RippleImpl.qml | 2 ++ resources/qml/ui/Snackbar.qml | 2 ++ resources/qml/ui/media/MediaControls.qml | 2 ++ 12 files changed, 19 insertions(+) diff --git a/resources/qml/MatrixTextField.qml b/resources/qml/MatrixTextField.qml index 4ceadf6c..655c4f07 100644 --- 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 diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml index 8b6af57a..fd92e431 100644 --- 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 diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml index f253b7a8..eb8fdc72 100644 --- 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 { diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml index 764bdf62..07d1f639 100644 --- 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 { diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml index f0a83a24..c123eb44 100644 --- 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 { diff --git a/resources/qml/TimelineBubbleMessageStyle.qml b/resources/qml/TimelineBubbleMessageStyle.qml index dd197264..71314e9f 100644 --- 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 { diff --git a/resources/qml/TimelineDefaultMessageStyle.qml b/resources/qml/TimelineDefaultMessageStyle.qml index 16db9964..ec5276c5 100644 --- 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 { diff --git a/resources/qml/ToggleButton.qml b/resources/qml/ToggleButton.qml index 50ed5187..19952b33 100644 --- 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 { diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml index f75ad7b7..0ec3d0fd 100644 --- 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 { diff --git a/resources/qml/ui/RippleImpl.qml b/resources/qml/ui/RippleImpl.qml index 9091bda2..01f054c1 100644 --- 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 { diff --git a/resources/qml/ui/Snackbar.qml b/resources/qml/ui/Snackbar.qml index 3c526d8d..c2d3b72b 100644 --- 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" diff --git a/resources/qml/ui/media/MediaControls.qml b/resources/qml/ui/media/MediaControls.qml index f4373908..4108064e 100644 --- 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 {