diff --git a/src/effects/scale/package/contents/code/main.js b/src/effects/scale/package/contents/code/main.js index 0cb9487235..ef6e3a526b 100644 --- a/src/effects/scale/package/contents/code/main.js +++ b/src/effects/scale/package/contents/code/main.js @@ -30,13 +30,11 @@ class ScaleEffect { } loadConfig() { - const defaultDuration = 160; + const defaultDuration = 200; const duration = effect.readConfig("Duration", defaultDuration) || defaultDuration; this.duration = animationTime(duration); - this.inScale = effect.readConfig("InScale", 0.96); - this.inOpacity = effect.readConfig("InOpacity", 0.4); - this.outScale = effect.readConfig("OutScale", 0.96); - this.outOpacity = effect.readConfig("OutOpacity", 0.0); + this.inScale = effect.readConfig("InScale", 0.8); + this.outScale = effect.readConfig("OutScale", 0.8); } static isScaleWindow(window) { @@ -104,7 +102,7 @@ class ScaleEffect { this.setupForcedRoles(window); window.scaleInAnimation = animate({ window: window, - curve: QEasingCurve.InOutSine, + curve: QEasingCurve.OutCubic, duration: this.duration, animations: [ { @@ -113,7 +111,7 @@ class ScaleEffect { }, { type: Effect.Opacity, - from: this.inOpacity + from: 0 } ] }); @@ -139,7 +137,7 @@ class ScaleEffect { this.setupForcedRoles(window); window.scaleOutAnimation = animate({ window: window, - curve: QEasingCurve.InOutSine, + curve: QEasingCurve.InCubic, duration: this.duration, animations: [ { @@ -148,7 +146,7 @@ class ScaleEffect { }, { type: Effect.Opacity, - to: this.outOpacity + to: 0 } ] }); diff --git a/src/effects/scale/package/contents/config/main.xml b/src/effects/scale/package/contents/config/main.xml index 4f9152a087..20ec056080 100644 --- a/src/effects/scale/package/contents/config/main.xml +++ b/src/effects/scale/package/contents/config/main.xml @@ -9,20 +9,10 @@ 0 - 0.96 - - - 0.4 - 0.0 - 1.0 + 0.8 - 0.96 - - - 0.0 - 0.0 - 1.0 + 0.8