From 517b69550e5c14931c816391b1fe8f7680cb6bf6 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sat, 31 Oct 2020 22:39:30 +0300
Subject: [PATCH] Fix permanent scrollbar for screensaver

---
 src/libraries/screensavermanager.css      |  4 ++++
 src/libraries/screensavermanager.js       |  7 ++++++-
 src/plugins/backdropScreensaver/plugin.js |  1 +
 src/plugins/logoScreensaver/plugin.js     | 23 ++++++++++++++---------
 4 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 src/libraries/screensavermanager.css

diff --git a/src/libraries/screensavermanager.css b/src/libraries/screensavermanager.css
new file mode 100644
index 0000000000..b11bbddb5e
--- /dev/null
+++ b/src/libraries/screensavermanager.css
@@ -0,0 +1,4 @@
+/* own "noScroll" class to avoid conflicts and the need for a scrollbar manager */
+.screensaver-noScroll {
+    overflow: hidden !important;
+}
diff --git a/src/libraries/screensavermanager.js b/src/libraries/screensavermanager.js
index 68a7dda73b..1d6370b9cc 100644
--- a/src/libraries/screensavermanager.js
+++ b/src/libraries/screensavermanager.js
@@ -3,6 +3,7 @@ import playbackManager from 'playbackManager';
 import pluginManager from 'pluginManager';
 import inputManager from 'inputManager';
 import * as userSettings from 'userSettings';
+import 'css!./screensavermanager.css';
 
 function getMinIdleTime() {
     // Returns the minimum amount of idle time required before the screen saver can be displayed
@@ -52,6 +53,8 @@ function ScreenSaverManager() {
 
         console.debug('Showing screensaver ' + screensaver.name);
 
+        document.body.classList.add('screensaver-noScroll');
+
         screensaver.show();
         activeScreenSaver = screensaver;
 
@@ -69,7 +72,9 @@ function ScreenSaverManager() {
     function hide() {
         if (activeScreenSaver) {
             console.debug('Hiding screensaver');
-            activeScreenSaver.hide();
+            activeScreenSaver.hide().then(() => {
+                document.body.classList.remove('screensaver-noScroll');
+            });
             activeScreenSaver = null;
         }
 
diff --git a/src/plugins/backdropScreensaver/plugin.js b/src/plugins/backdropScreensaver/plugin.js
index 917d8f48a3..c261d7508b 100644
--- a/src/plugins/backdropScreensaver/plugin.js
+++ b/src/plugins/backdropScreensaver/plugin.js
@@ -42,6 +42,7 @@ class BackdropScreensaver {
                 this.currentSlideshow.hide();
                 this.currentSlideshow = null;
             }
+            return Promise.resolve();
         }
     }
 /* eslint-enable indent */
diff --git a/src/plugins/logoScreensaver/plugin.js b/src/plugins/logoScreensaver/plugin.js
index 61b8f8a6d6..51c9362d36 100644
--- a/src/plugins/logoScreensaver/plugin.js
+++ b/src/plugins/logoScreensaver/plugin.js
@@ -150,16 +150,21 @@ export default function () {
         const elem = document.querySelector('.logoScreenSaver');
 
         if (elem) {
-            const onAnimationFinish = function () {
-                elem.parentNode.removeChild(elem);
-            };
+            return new Promise((resolve) => {
+                const onAnimationFinish = function () {
+                    elem.parentNode.removeChild(elem);
+                    resolve();
+                };
 
-            if (elem.animate) {
-                const animation = fadeOut(elem, 1);
-                animation.onfinish = onAnimationFinish;
-            } else {
-                onAnimationFinish();
-            }
+                if (elem.animate) {
+                    const animation = fadeOut(elem, 1);
+                    animation.onfinish = onAnimationFinish;
+                } else {
+                    onAnimationFinish();
+                }
+            });
         }
+
+        return Promise.resolve();
     };
 }