summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Edmundson <[email protected]>2017-03-06 00:16:22 +0000
committerDavid Edmundson <[email protected]>2017-03-06 00:16:33 +0000
commitf255af63d2c9eb919dbe75e7a8ba681646890fda (patch)
tree155860ee90a2977de80655654831165820f56358
parent67d9d109674fe9565d0905de7f5f6715547a9279 (diff)
Set a longer wallpaper transition time
Summary: Whilst using units is generally good, the wallpaper transition time is way too short. It's a different type of animation to the others, especially in a slideshow, where the transition is an important part of the behaviour. This patch loads it from a hidden configuration option with a duration of 1000ms, if and only if animations are enabled. Value determined through brief trial and error. BUG: 365979 Test Plan: Opened wallpaper. Clicked next. Also changed static wallpaper manually, transition looked fine Reviewers: #plasma, broulik Reviewed By: #plasma, broulik Subscribers: broulik, plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D4370
-rw-r--r--wallpapers/image/imagepackage/contents/config/main.xml4
-rw-r--r--wallpapers/image/imagepackage/contents/ui/main.qml6
-rw-r--r--wallpapers/image/slideshowpackage/contents/config/main.xml6
3 files changed, 13 insertions, 3 deletions
diff --git a/wallpapers/image/imagepackage/contents/config/main.xml b/wallpapers/image/imagepackage/contents/config/main.xml
index c097b30..7569eda 100644
--- a/wallpapers/image/imagepackage/contents/config/main.xml
+++ b/wallpapers/image/imagepackage/contents/config/main.xml
@@ -26,6 +26,10 @@
<label>Interval between slides</label>
<default>10</default>
</entry>
+ <entry name="TransitionAnimationDuration" type="int">
+ <label>Fade Transition Animation (ms)</label>
+ <default>1000</default>
+ </entry>
</group>
</kcfg>
diff --git a/wallpapers/image/imagepackage/contents/ui/main.qml b/wallpapers/image/imagepackage/contents/ui/main.qml
index d5384e4..fc22176 100644
--- a/wallpapers/image/imagepackage/contents/ui/main.qml
+++ b/wallpapers/image/imagepackage/contents/ui/main.qml
@@ -177,7 +177,7 @@ Item {
target: currentImage
from: 0
to: 1
- duration: units.longDuration
+ duration: fadeOtherAnimator.duration
}
OpacityAnimator {
id: fadeOtherAnimator
@@ -186,7 +186,9 @@ Item {
from: 1
// cannot disable an animation individually, so we just fade from 1 to 1
to: enabled ? 0 : 1
- duration: units.longDuration
+
+ //use configured duration if animations are enabled
+ duration: units.longDuration && wallpaper.configuration.TransitionAnimationDuration
}
}
ScriptAction {
diff --git a/wallpapers/image/slideshowpackage/contents/config/main.xml b/wallpapers/image/slideshowpackage/contents/config/main.xml
index c097b30..f75e94d 100644
--- a/wallpapers/image/slideshowpackage/contents/config/main.xml
+++ b/wallpapers/image/slideshowpackage/contents/config/main.xml
@@ -23,9 +23,13 @@
<default></default>
</entry>
<entry name="SlideInterval" type="int">
- <label>Interval between slides</label>
+ <label>Interval between slides (s)</label>
<default>10</default>
</entry>
+ <entry name="TransitionAnimationDuration" type="int">
+ <label>Fade Transition Animation (ms)</label>
+ <default>1000</default>
+ </entry>
</group>
</kcfg>