From 8df97ad32394500af9e1195048e5121a1b9c9adc Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
Date: Fri, 10 Jun 2022 09:59:26 +0800
Subject: [PATCH] wallpapers/image: follow system animation speed setting in
 wallpaper transition

The value is to keep compatible with the old feeling defined by
"TransitionAnimationDuration" (default: 1000)

BUG: 395324
FIXED-IN: 5.26
---
 wallpapers/image/imagepackage/contents/config/main.xml     | 4 ----
 wallpapers/image/imagepackage/contents/ui/main.qml         | 6 ++++--
 wallpapers/image/slideshowpackage/contents/config/main.xml | 4 ----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/wallpapers/image/imagepackage/contents/config/main.xml b/wallpapers/image/imagepackage/contents/config/main.xml
index 46a44ea9b..868d5af71 100644
--- a/wallpapers/image/imagepackage/contents/config/main.xml
+++ b/wallpapers/image/imagepackage/contents/config/main.xml
@@ -38,10 +38,6 @@
       <label>Interval between slides (s)</label>
       <default>900</default>
     </entry>
-    <entry name="TransitionAnimationDuration" type="int">
-      <label>Fade Transition Animation  (ms)</label>
-      <default>1000</default>
-    </entry>
     <entry name="UncheckedSlides" type="StringList">
       <label>Unchecked Slides</label>
       <default></default>
diff --git a/wallpapers/image/imagepackage/contents/ui/main.qml b/wallpapers/image/imagepackage/contents/ui/main.qml
index 2f4a98e56..f7439fc97 100644
--- a/wallpapers/image/imagepackage/contents/ui/main.qml
+++ b/wallpapers/image/imagepackage/contents/ui/main.qml
@@ -178,16 +178,18 @@ QQC2.StackView {
 
     replaceEnter: Transition {
         OpacityAnimator {
+            id: replaceEnterOpacityAnimator
             from: 0
             to: 1
-            duration: wallpaper.configuration.TransitionAnimationDuration
+            // The value is to keep compatible with the old feeling defined by "TransitionAnimationDuration" (default: 1000)
+            duration: Math.round(PlasmaCore.Units.veryLongDuration * 2.5)
         }
     }
     // Keep the old image around till the new one is fully faded in
     // If we fade both at the same time you can see the background behind glimpse through
     replaceExit: Transition{
         PauseAnimation {
-            duration: wallpaper.configuration.TransitionAnimationDuration
+            duration: replaceEnterOpacityAnimator.duration
         }
     }
 }
diff --git a/wallpapers/image/slideshowpackage/contents/config/main.xml b/wallpapers/image/slideshowpackage/contents/config/main.xml
index 92d618171..2be863e8c 100644
--- a/wallpapers/image/slideshowpackage/contents/config/main.xml
+++ b/wallpapers/image/slideshowpackage/contents/config/main.xml
@@ -30,10 +30,6 @@
       <label>Interval between slides (s)</label>
       <default>900</default>
     </entry>
-    <entry name="TransitionAnimationDuration" type="int">
-      <label>Fade Transition Animation (ms)</label>
-      <default>1000</default>
-    </entry>
     <entry name="UncheckedSlides" type="StringList">
       <label>Unchecked Slides</label>
       <default></default>