yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

effects/scale: Rewrite the effect using ES6 features

Browse source 
Since the scripted effects were ported to QJSEngine, it's possible now to
use ECMAScript 2015 perks such as classes, let and const.

This change ports the scale effect to some ES6 features to make the code
neater.
This commit is contained in:
Vlad Zahorodnii 2021-05-02 11:09:27 +00:00
parent db020c5614
commit 9fb58479b7
1 changed files with 53 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
src/effects/scale/package/contents/code/main.js
View file

@ -2,14 +2,14 @@
KWin - the KDE window manager
This file is part of the KDE project.
SPDX-FileCopyrightText: 2018 Vlad Zahorodnii <vlad.zahorodnii@kde.org>
SPDX-FileCopyrightText: 2018, 2021 Vlad Zahorodnii <vlad.zahorodnii@kde.org>
SPDX-License-Identifier: GPL-2.0-or-later
*/
"use strict";
var blacklist = [
const blacklist = [
// The logout screen has to be animated only by the logout effect.
"ksmserver ksmserver",
"ksmserver-logout-greeter ksmserver-logout-greeter",
@ -18,17 +18,28 @@ var blacklist = [
"ksplashqml ksplashqml"
];
var scaleEffect = {
loadConfig: function (window) {
var defaultDuration = 160;
var duration = effect.readConfig("Duration", defaultDuration) || defaultDuration;
scaleEffect.duration = animationTime(duration);
scaleEffect.inScale = effect.readConfig("InScale", 0.96);
scaleEffect.inOpacity = effect.readConfig("InOpacity", 0.4);
scaleEffect.outScale = effect.readConfig("OutScale", 0.96);
scaleEffect.outOpacity = effect.readConfig("OutOpacity", 0.0);
},
isScaleWindow: function (window) {
class ScaleEffect {
constructor() {
effect.configChanged.connect(this.loadConfig.bind(this));
effect.animationEnded.connect(this.cleanupForcedRoles.bind(this));
effects.windowAdded.connect(this.slotWindowAdded.bind(this));
effects.windowClosed.connect(this.slotWindowClosed.bind(this));
effects.windowDataChanged.connect(this.slotWindowDataChanged.bind(this));
this.loadConfig();
}
loadConfig() {
const defaultDuration = 160;
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);
}
static isScaleWindow(window) {
// We don't want to animate most of plasmashell's windows, yet, some
// of them we want to, for example, Task Manager Settings window.
// The problem is that all those window share single window class.
@ -65,20 +76,23 @@ var scaleEffect = {
}
return window.normalWindow || window.dialog;
},
setupForcedRoles: function (window) {
}
setupForcedRoles(window) {
window.setData(Effect.WindowForceBackgroundContrastRole, true);
window.setData(Effect.WindowForceBlurRole, true);
},
cleanupForcedRoles: function (window) {
}
cleanupForcedRoles(window) {
window.setData(Effect.WindowForceBackgroundContrastRole, null);
window.setData(Effect.WindowForceBlurRole, null);
},
slotWindowAdded: function (window) {
}
slotWindowAdded(window) {
if (effects.hasActiveFullScreenEffect) {
return;
}
if (!scaleEffect.isScaleWindow(window)) {
if (!ScaleEffect.isScaleWindow(window)) {
return;
}
if (!window.visible) {
@ -87,28 +101,29 @@ var scaleEffect = {
if (!effect.grab(window, Effect.WindowAddedGrabRole)) {
return;
}
scaleEffect.setupForcedRoles(window);
this.setupForcedRoles(window);
window.scaleInAnimation = animate({
window: window,
curve: QEasingCurve.InOutSine,
duration: scaleEffect.duration,
duration: this.duration,
animations: [
{
type: Effect.Scale,
from: scaleEffect.inScale
from: this.inScale
},
{
type: Effect.Opacity,
from: scaleEffect.inOpacity
from: this.inOpacity
}
]
});
},
slotWindowClosed: function (window) {
}
slotWindowClosed(window) {
if (effects.hasActiveFullScreenEffect) {
return;
}
if (!scaleEffect.isScaleWindow(window)) {
if (!ScaleEffect.isScaleWindow(window)) {
return;
}
if (!window.visible) {
@ -121,47 +136,39 @@ var scaleEffect = {
cancel(window.scaleInAnimation);
delete window.scaleInAnimation;
}
scaleEffect.setupForcedRoles(window);
this.setupForcedRoles(window);
window.scaleOutAnimation = animate({
window: window,
curve: QEasingCurve.InOutSine,
duration: scaleEffect.duration,
duration: this.duration,
animations: [
{
type: Effect.Scale,
to: scaleEffect.outScale
to: this.outScale
},
{
type: Effect.Opacity,
to: scaleEffect.outOpacity
to: this.outOpacity
}
]
});
},
slotWindowDataChanged: function (window, role) {
}
slotWindowDataChanged(window, role) {
if (role == Effect.WindowAddedGrabRole) {
if (window.scaleInAnimation && effect.isGrabbed(window, role)) {
cancel(window.scaleInAnimation);
delete window.scaleInAnimation;
scaleEffect.cleanupForcedRoles(window);
this.cleanupForcedRoles(window);
}
} else if (role == Effect.WindowClosedGrabRole) {
if (window.scaleOutAnimation && effect.isGrabbed(window, role)) {
cancel(window.scaleOutAnimation);
delete window.scaleOutAnimation;
scaleEffect.cleanupForcedRoles(window);
this.cleanupForcedRoles(window);
}
}
},
init: function () {
scaleEffect.loadConfig();
effect.configChanged.connect(scaleEffect.loadConfig);
effect.animationEnded.connect(scaleEffect.cleanupForcedRoles);
effects.windowAdded.connect(scaleEffect.slotWindowAdded);
effects.windowClosed.connect(scaleEffect.slotWindowClosed);
effects.windowDataChanged.connect(scaleEffect.slotWindowDataChanged);
}
};
}
scaleEffect.init();
new ScaleEffect();