mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #1688 from Supergamer1337/play_mouse_timings

Browse source 
Made cursor hide on OSD hide.
This commit is contained in:
dkanada 2020-07-31 04:29:32 +09:00 • committed by GitHub
commit f15c1cbb90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/playback/video/index.js
View file

@ -1,6 +1,7 @@
import playbackManager from 'playbackManager'; import playbackManager from 'playbackManager';
import dom from 'dom'; import dom from 'dom';
import inputManager from 'inputManager'; import inputManager from 'inputManager';
import mouseManager from 'mouseManager';
import datetime from 'datetime'; import datetime from 'datetime';
import itemHelper from 'itemHelper'; import itemHelper from 'itemHelper';
import mediaInfo from 'mediaInfo'; import mediaInfo from 'mediaInfo';
@ -367,6 +368,7 @@ import 'css!assets/css/videoosd';
function hideOsd() { function hideOsd() {
slideUpToHide(headerElement); slideUpToHide(headerElement);
hideMainOsdControls(); hideMainOsdControls();
mouseManager.hideCursor();
} }
function toggleOsd() { function toggleOsd() {
@ -435,6 +437,7 @@ import 'css!assets/css/videoosd';
const elem = osdBottomElement; const elem = osdBottomElement;
clearHideAnimationEventListeners(elem); clearHideAnimationEventListeners(elem);
elem.classList.add('videoOsdBottom-hidden'); elem.classList.add('videoOsdBottom-hidden');
dom.addEventListener(elem, transitionEndEventName, onHideAnimationComplete, { dom.addEventListener(elem, transitionEndEventName, onHideAnimationComplete, {
once: true once: true
}); });

29
src/scripts/mouseManager.js
View file

@ -31,6 +31,22 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
} }
} }
function showCursor() {
if (isMouseIdle) {
isMouseIdle = false;
removeIdleClasses();
events.trigger(self, 'mouseactive');
}
}
function hideCursor() {
if (!isMouseIdle) {
isMouseIdle = true;
addIdleClasses();
events.trigger(self, 'mouseidle');
}
}
var lastPointerMoveData; var lastPointerMoveData;
function onPointerMove(e) { function onPointerMove(e) {
var eventX = e.screenX; var eventX = e.screenX;
@ -61,11 +77,7 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
lastMouseInputTime = new Date().getTime(); lastMouseInputTime = new Date().getTime();
notifyApp(); notifyApp();
if (isMouseIdle) { showCursor();
isMouseIdle = false;
removeIdleClasses();
events.trigger(self, 'mouseactive');
}
} }
function onPointerEnter(e) { function onPointerEnter(e) {
@ -99,9 +111,7 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
function onMouseInterval() { function onMouseInterval() {
if (!isMouseIdle && mouseIdleTime() >= 5000) { if (!isMouseIdle && mouseIdleTime() >= 5000) {
isMouseIdle = true; hideCursor();
addIdleClasses();
events.trigger(self, 'mouseidle');
} }
} }
@ -157,5 +167,8 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
events.on(layoutManager, 'modechange', initMouse); events.on(layoutManager, 'modechange', initMouse);
self.hideCursor = hideCursor;
self.showCursor = showCursor;
return self; return self;
}); });