aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Edmundson <[email protected]>2018-10-04 13:05:51 +0100
committerDavid Edmundson <[email protected]>2018-10-04 13:05:51 +0100
commita10647edf5b576e163d0d80b9368edc93f1bc9d0 (patch)
treed3187da0db641a6d719d57b61140cf91b9633a42
parent12cc0809456d5844059e84af61cae30de888b20c (diff)
Disable fade effect during fullscreen effects
Summary: This means that if one opens/closes a window whilst present windows (for example) is active we don't have two effects meddling with the opacity. Like glide and scale this disables if it's invoked during an active full screen effect, but it does not cancel animations that are running when a full screen effect is launched. Test Plan: Windows still fade normally as before Ran sleep ; dolphin with present windows / cube Present windows fades windows itself so it's hard to see any difference But it's more technically correct Reviewers: #kwin, zzag Reviewed By: #kwin, zzag Subscribers: zzag, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D15933
-rw-r--r--effects/fade/package/contents/code/main.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/effects/fade/package/contents/code/main.js b/effects/fade/package/contents/code/main.js
index 4f18cb2..f9206de 100644
--- a/effects/fade/package/contents/code/main.js
+++ b/effects/fade/package/contents/code/main.js
@@ -53,6 +53,9 @@ effect.configChanged.connect(function() {
loadConfig();
});
function fadeInHandler(w) {
+ if (effects.hasActiveFullScreenEffect) {
+ return;
+ }
if (fadeWindows && isFadeWindow(w)) {
if (w.fadeOutWindowTypeAnimation !== undefined) {
cancel(w.fadeOutWindowTypeAnimation);
@@ -62,6 +65,9 @@ function fadeInHandler(w) {
}
}
function fadeOutHandler(w) {
+ if (effects.hasActiveFullScreenEffect) {
+ return;
+ }
if (fadeWindows && isFadeWindow(w)) {
if (w.fadeOutWindowTypeAnimation !== undefined) {
// don't animate again as it was already animated through window hidden