From 3ffd2bc4b920728214ae688463fc2ff1bd6a281b Mon Sep 17 00:00:00 2001 From: Supergamer1337 Date: Wed, 29 Jul 2020 21:08:50 +0200 Subject: [PATCH] Made cursor hide on OSD hide. Cursor shows on OSD show. Co-authored-by: Esaias Tilly --- src/controllers/playback/video/index.js | 7 +++++++ src/scripts/mouseManager.js | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js index d2bddfc136..23453857f9 100644 --- a/src/controllers/playback/video/index.js +++ b/src/controllers/playback/video/index.js @@ -1,6 +1,7 @@ import playbackManager from 'playbackManager'; import dom from 'dom'; import inputManager from 'inputManager'; +import mouseManager from 'mouseManager'; import datetime from 'datetime'; import itemHelper from 'itemHelper'; import mediaInfo from 'mediaInfo'; @@ -421,6 +422,9 @@ import 'css!assets/css/videoosd'; elem.classList.remove('hide'); elem.classList.remove('videoOsdBottom-hidden'); + mouseManager.removeIdleClasses(); // Remove Idle Classes To Show Cursor + mouseManager.lastMouseInputTime = new Date().getTime(); // Reset Mouse Input Time + if (!layoutManager.mobile) { setTimeout(function () { focusManager.focus(elem.querySelector('.btnPause')); @@ -435,6 +439,9 @@ import 'css!assets/css/videoosd'; const elem = osdBottomElement; clearHideAnimationEventListeners(elem); elem.classList.add('videoOsdBottom-hidden'); + + mouseManager.addIdleClasses(); // Add Idle Classes To Hide Cursor + dom.addEventListener(elem, transitionEndEventName, onHideAnimationComplete, { once: true }); diff --git a/src/scripts/mouseManager.js b/src/scripts/mouseManager.js index 4fc174381a..cc4d5459b5 100644 --- a/src/scripts/mouseManager.js +++ b/src/scripts/mouseManager.js @@ -157,5 +157,10 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd events.on(layoutManager, 'modechange', initMouse); + // Make Both Idle Class Functions And Last Mouse Input Time Accessible + self.addIdleClasses = addIdleClasses; + self.removeIdleClasses = removeIdleClasses; + self.lastMouseInputTime = lastMouseInputTime; + return self; });