Fix #198

Andrews54757 · Aug 3, 2024 · df641a6 · df641a6
1 parent ce2d02a
commit df641a6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/chrome/player/ui/VolumeControls.mjs b/chrome/player/ui/VolumeControls.mjs
@@ -1,4 +1,5 @@
 import {EventEmitter} from '../modules/eventemitter.mjs';
+import {EnvUtils} from '../utils/EnvUtils.mjs';
 import {Utils} from '../utils/Utils.mjs';
 import {WebUtils} from '../utils/WebUtils.mjs';
 import {DOMElements} from './DOMElements.mjs';
@@ -29,7 +30,11 @@ export class VolumeControls extends EventEmitter {
     });
 
     DOMElements.volumeBlock.addEventListener('wheel', (e) => {
-      this.setVolume(Math.max(0, Math.min(3, this.client.volume + Utils.clamp(e.deltaY, -1, 1) * 0.01)));
+      let delta = e.deltaY;
+      if (!EnvUtils.isMacOS()) {
+        delta = -delta;
+      }
+      this.setVolume(Math.max(0, Math.min(3, this.client.volume + Utils.clamp(delta, -1, 1) * 0.01)));
       e.preventDefault();
       e.stopPropagation();
     });

diff --git a/chrome/player/ui/audio/AudioChannelMixer.mjs b/chrome/player/ui/audio/AudioChannelMixer.mjs
@@ -1,5 +1,6 @@
 import {Localize} from '../../modules/Localize.mjs';
 import {AudioUtils} from '../../utils/AudioUtils.mjs';
+import {EnvUtils} from '../../utils/EnvUtils.mjs';
 import {Utils} from '../../utils/Utils.mjs';
 import {WebUtils} from '../../utils/WebUtils.mjs';
 import {AudioChannelControl} from './config/AudioChannelControl.mjs';
@@ -252,7 +253,10 @@ export class AudioChannelMixer {
       if (e.deltaX !== 0) return; // ignore horizontal scrolling (for trackpad)
       e.preventDefault();
       e.stopPropagation();
-      const delta = Utils.clamp(e.deltaY, -1, 1);
+      let delta = Utils.clamp(e.deltaY, -1, 1);
+      if (!EnvUtils.isMacOS()) {
+        delta = -delta;
+      }
       const ratio = parseFloat(els.volumeHandle.style.top) / 100;
       const db = AudioUtils.mixerPositionRatioToDB(ratio - delta * 0.05);
       els.volumeHandle.style.top = `${AudioUtils.mixerDBToPositionRatio(db) * 100}%`;

diff --git a/chrome/player/utils/EnvUtils.mjs b/chrome/player/utils/EnvUtils.mjs
@@ -37,4 +37,8 @@ export class EnvUtils {
   static isIncognito() {
     return this.isExtension() ? chrome.extension.inIncognitoContext : false;
   }
+
+  static isMacOS() {
+    return navigator.userAgent.indexOf('Mac OS') !== -1;
+  }
 }