summaryrefslogtreecommitdiff
blob: 83539c14c04368fbfe0b61f97f40f6e78270f6f9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
From 2958702524348e9e4fcbdf490be731e92b353dad Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Tue, 24 Mar 2020 08:10:54 -0600
Subject: Stop multiplying duration values

Summary:
After D28144, some animations are now too long because they were inappropriately
multiplying a duration value. That's no longer necessary, so let's remove the
multiplication.

Depends on D28144

Test Plan: Various things that were a bit too slow before feel just right now

Reviewers: #vdg, #plasma, cblack

Reviewed By: #vdg, #plasma, cblack

Subscribers: cblack, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D28238
---
 applets/devicenotifier/package/contents/ui/FullRepresentation.qml | 2 +-
 applets/systemtray/package/contents/ui/ExpanderArrow.qml          | 2 +-
 lookandfeel/contents/components/ActionButton.qml                  | 4 ++--
 lookandfeel/contents/components/UserDelegate.qml                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
index d15e47c..80b9c73 100644
--- a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
+++ b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
@@ -225,7 +225,7 @@ MouseArea {
                     popupIconTimer.restart()
                 }
             }
-            Behavior on height { NumberAnimation { duration: units.shortDuration * 3 } }
+            Behavior on height { NumberAnimation { duration: units.shortDuration } }
         }
     }
 }
diff --git a/applets/systemtray/package/contents/ui/ExpanderArrow.qml b/applets/systemtray/package/contents/ui/ExpanderArrow.qml
index 9baf654..729f56b 100644
--- a/applets/systemtray/package/contents/ui/ExpanderArrow.qml
+++ b/applets/systemtray/package/contents/ui/ExpanderArrow.qml
@@ -37,7 +37,7 @@ PlasmaCore.ToolTipArea {
         anchors.fill: parent
         onClicked: root.expanded = !root.expanded
 
-        readonly property int arrowAnimationDuration: units.shortDuration * 3
+        readonly property int arrowAnimationDuration: units.shortDuration
 
         PlasmaCore.Svg {
             id: arrowSvg
diff --git a/lookandfeel/contents/components/ActionButton.qml b/lookandfeel/contents/components/ActionButton.qml
index 9fbd2a8..7a66c56 100644
--- a/lookandfeel/contents/components/ActionButton.qml
+++ b/lookandfeel/contents/components/ActionButton.qml
@@ -44,7 +44,7 @@ Item {
     opacity: activeFocus || containsMouse ? 1 : 0.85
         Behavior on opacity {
             PropertyAnimation { // OpacityAnimator makes it turn black at random intervals
-                duration: units.longDuration * 2
+                duration: units.longDuration
                 easing.type: Easing.InOutQuad
             }
     }
@@ -59,7 +59,7 @@ Item {
         opacity: activeFocus || containsMouse ? (softwareRendering ? 0.8 : 0.15) : (softwareRendering ? 0.6 : 0)
         Behavior on opacity {
                 PropertyAnimation { // OpacityAnimator makes it turn black at random intervals
-                    duration: units.longDuration * 3
+                    duration: units.longDuration
                     easing.type: Easing.InOutQuad
                 }
         }
diff --git a/lookandfeel/contents/components/UserDelegate.qml b/lookandfeel/contents/components/UserDelegate.qml
index 8882e39..cdb55f1 100644
--- a/lookandfeel/contents/components/UserDelegate.qml
+++ b/lookandfeel/contents/components/UserDelegate.qml
@@ -72,7 +72,7 @@ Item {
         Behavior on width { 
             PropertyAnimation {
                 from: faceSize
-                duration: units.longDuration * 2;
+                duration: units.longDuration;
             }
         }
         width: isCurrent ? faceSize : faceSize - units.largeSpacing
-- 
cgit v1.1