From 179c16fd08d7e22ce32593cb35ba77ec6084e4f0 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Mon, 20 Feb 2023 19:18:05 -0500
Subject: Use a single, reversible privacy screen transition

---
 resources/qml/PrivacyScreen.qml          | 24 ++----------------------
 resources/qml/delegates/ImageMessage.qml | 14 ++------------
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml
index 11ab27bd..204eb1bd 100644
--- a/resources/qml/PrivacyScreen.qml
+++ b/resources/qml/PrivacyScreen.qml
@@ -78,30 +78,10 @@ Item {
             }
         ]
         transitions: [
-            Transition {
-                from: "Visible"
-                to: "Invisible"
-
-                SequentialAnimation {
-                    NumberAnimation {
-                        target: screenSaver
-                        property: "opacity"
-                        duration: 250
-                        easing.type: Easing.InQuad
-                    }
-
-                    NumberAnimation {
-                        target: screenSaver
-                        property: "visible"
-                        duration: 0
-                    }
-
-                }
-
-            },
             Transition {
                 from: "Invisible"
                 to: "Visible"
+                reversible: true
 
                 SequentialAnimation {
                     NumberAnimation {
@@ -113,7 +93,7 @@ Item {
                     NumberAnimation {
                         target: screenSaver
                         property: "opacity"
-                        duration: 500
+                        duration: 300
                         easing.type: Easing.InQuad
                     }
 
diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml
index 1e2674ae..3d2981ca 100644
--- a/resources/qml/delegates/ImageMessage.qml
+++ b/resources/qml/delegates/ImageMessage.qml
@@ -87,25 +87,15 @@ AbstractButton {
             }
         ]
         transitions: [
-            Transition {
-                from: "Visible"
-                to: "Invisible"
-
-                NumberAnimation {
-                    target: blurhash_
-                    property: "opacity"
-                    duration: 250
-                    easing.type: Easing.InQuad
-                }
-            },
             Transition {
                 from: "Invisible"
                 to: "Visible"
+                reversible: true
 
                 NumberAnimation {
                     target: blurhash_
                     property: "opacity"
-                    duration: 500
+                    duration: 300
                     easing.type: Easing.InQuad
                 }
             }
-- 
cgit 1.4.1