Skip to content

Commit 63a6a31

Browse files
committed
* Only apply scroll throttle when delta value is small (assumed to be from touchpad), update throttle wait 100 > 200ms
1 parent 218ad97 commit 63a6a31

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1961,7 +1961,7 @@ export default defineComponent({
19611961

19621962
// #region mouse scroll handlers
19631963

1964-
const mouseScrollThrottleWaitMs = 100
1964+
const mouseScrollThrottleWaitMs = 200
19651965

19661966
/**
19671967
* @param {WheelEvent} event
@@ -1980,7 +1980,12 @@ export default defineComponent({
19801980
function mouseScrollPlaybackRateHandler(event) {
19811981
event.preventDefault()
19821982

1983-
mouseScrollPlaybackRateThrottle(event)
1983+
// Touchpad scroll = small deltaX/deltaY
1984+
if (Math.abs(event.deltaX) <= 5 && Math.abs(event.deltaY) <= 5) {
1985+
mouseScrollPlaybackRateThrottle(event)
1986+
} else {
1987+
mouseScrollPlaybackRate(event)
1988+
}
19841989
}
19851990

19861991
/**
@@ -2001,7 +2006,12 @@ export default defineComponent({
20012006
if (canSeek()) {
20022007
event.preventDefault()
20032008

2004-
mouseScrollSkipThrottle(event)
2009+
// Touchpad scroll = small deltaX/deltaY
2010+
if (Math.abs(event.deltaX) <= 5 && Math.abs(event.deltaY) <= 5) {
2011+
mouseScrollSkipThrottle(event)
2012+
} else {
2013+
mouseScrollSkip(event)
2014+
}
20052015
}
20062016
}
20072017

@@ -2033,7 +2043,12 @@ export default defineComponent({
20332043
event.preventDefault()
20342044
event.stopPropagation()
20352045

2036-
mouseScrollVolumeThrottle(event)
2046+
// Touchpad scroll = small deltaX/deltaY
2047+
if (Math.abs(event.deltaX) <= 5 && Math.abs(event.deltaY) <= 5) {
2048+
mouseScrollVolumeThrottle(event)
2049+
} else {
2050+
mouseScrollVolume(event)
2051+
}
20372052
}
20382053
}
20392054

0 commit comments

Comments
 (0)