Floorp-Projects · mystster · Oct 30, 2025 · Nov 2, 2025 · Nov 9, 2025
diff --git a/browser-features/chrome/common/mouse-gesture/config.ts b/browser-features/chrome/common/mouse-gesture/config.ts
@@ -44,6 +44,7 @@ const ContextMenuCodec = t.type({
 
 const MouseGestureConfigRequired = t.type({
   rockerGesturesEnabled: t.boolean,
+  wheelGesturesEnabled: t.boolean,
   sensitivity: t.number,
   showTrail: t.boolean,
   showLabel: t.boolean,
@@ -66,6 +67,7 @@ export type MouseGestureConfig = t.TypeOf<typeof MouseGestureConfigCodec>;
 export const defaultConfig: MouseGestureConfig = {
   enabled: false,
   rockerGesturesEnabled: true,
+  wheelGesturesEnabled: true,
   sensitivity: 40,
   showTrail: true,
   showLabel: true,

diff --git a/browser-features/chrome/common/mouse-gesture/controller.ts b/browser-features/chrome/common/mouse-gesture/controller.ts
@@ -44,6 +44,9 @@ export class MouseGestureController {
       globalThis.addEventListener("mousemove", this.handleMouseMove);
       globalThis.addEventListener("mouseup", this.handleMouseUp);
       globalThis.addEventListener("contextmenu", this.handleContextMenu, true);
+      globalThis.addEventListener("wheel", this.handleMouseWheel, {
+        passive: false,
+      });
       this.eventListenersAttached = true;
     }
   }
@@ -58,6 +61,7 @@ export class MouseGestureController {
         this.handleContextMenu,
         true,
       );
+      globalThis.removeEventListener("wheel", this.handleMouseWheel);
       this.eventListenersAttached = false;
     }
 
@@ -236,6 +240,41 @@ export class MouseGestureController {
     this.resetGestureState();
   };
 
+  private handleMouseWheel = (event: WheelEvent): void => {
+    if (!this.isGestureActive || !isEnabled()) {
+      return;
+    }
+
+    const config = getConfig();
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (!config.wheelGesturesEnabled) {
+      return;
+    }
+
+    let action: string | null = null;
+    if (event.deltaY < 0) {
+      action = "gecko-show-previous-tab";
+    } else if (event.deltaY > 0) {
+      action = "gecko-show-next-tab";
+    }
+
+    if (action) {
+      executeGestureAction(action);
+      event.preventDefault();
+      event.stopPropagation();
+
+      this.isContextMenuPrevented = true;
+
+      if (this.preventionTimeoutId) {
+        clearTimeout(this.preventionTimeoutId);
+      }
+      this.preventionTimeoutId = setTimeout(() => {
+        this.isContextMenuPrevented = false;
+        this.preventionTimeoutId = null;
+      }, getConfig().contextMenu.preventionTimeout);
+    }
+  };
+
   private getTotalMovement(): number {
     if (this.mouseTrail.length < 2) return 0;
 
@@ -578,4 +617,4 @@ export class MouseGestureController {
     const normalizedDistance = dtw[n][m] / trailTotalWeight;
     return Math.max(0, 1 - normalizedDistance);
   }
-}
+}
diff --git a/browser-features/pages-settings/src/app/gesture/components/Preferences.tsx b/browser-features/pages-settings/src/app/gesture/components/Preferences.tsx
@@ -87,6 +87,16 @@ export function GeneralSettings({
                             disabled={!config.enabled}
                         />
                     </div>
+                    <div className="flex items-center justify-between py-2">
+                        <span className="text-base-content/90">
+                            {t("mouseGesture.wheelGesturesEnabled")}
+                        </span>
+                        <Switch
+                            checked={config.wheelGesturesEnabled ?? true}
+                            onChange={() => updateConfig({ wheelGesturesEnabled: !(config.wheelGesturesEnabled ?? true) })}
+                            disabled={!config.enabled}
+                        />
+                    </div>
 
                     <div className="flex items-center justify-between py-2">
                         <span className="text-base-content/90">

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/ar-SA.json b/browser-features/pages-settings/src/lib/i18n/locales/ar-SA.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/cs-CZ.json b/browser-features/pages-settings/src/lib/i18n/locales/cs-CZ.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/da-DK.json b/browser-features/pages-settings/src/lib/i18n/locales/da-DK.json
@@ -476,6 +476,7 @@
         "actionDescription": "Beskrivelse af bevægelsen",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Gå tilbage",
             "gecko-forward": "Gå frem",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/de-DE.json b/browser-features/pages-settings/src/lib/i18n/locales/de-DE.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/el-GR.json b/browser-features/pages-settings/src/lib/i18n/locales/el-GR.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/en-GB.json b/browser-features/pages-settings/src/lib/i18n/locales/en-GB.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/en-US.json b/browser-features/pages-settings/src/lib/i18n/locales/en-US.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/es-ES.json b/browser-features/pages-settings/src/lib/i18n/locales/es-ES.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/fr-FR.json b/browser-features/pages-settings/src/lib/i18n/locales/fr-FR.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description du geste",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Précédent",
             "gecko-forward": "Suivant",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/hu-HU.json b/browser-features/pages-settings/src/lib/i18n/locales/hu-HU.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/id-ID.json b/browser-features/pages-settings/src/lib/i18n/locales/id-ID.json
@@ -476,6 +476,7 @@
         "actionDescription": "Deskripsi gestur",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/it-IT.json b/browser-features/pages-settings/src/lib/i18n/locales/it-IT.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/ja-JP-mac.json b/browser-features/pages-settings/src/lib/i18n/locales/ja-JP-mac.json
@@ -476,6 +476,7 @@
         "actionDescription": "ジェスチャーの説明",
         "rockerGesturesEnabled": "ロッカージェスチャーを有効にする",
         "rockerGesturesDescription": "右クリックしながら左に動かすとページを戻り、右クリックしながら右に動かすと進みます。 (実験的)",
+        "wheelGesturesEnabled": "ホイールジェスチャーを有効にする",
         "actions": {
             "gecko-back": "戻る",
             "gecko-forward": "進む",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/ja-JP.json b/browser-features/pages-settings/src/lib/i18n/locales/ja-JP.json
@@ -476,6 +476,7 @@
         "actionDescription": "ジェスチャーの説明",
         "rockerGesturesEnabled": "ロッカージェスチャーを有効にする",
         "rockerGesturesDescription": "右クリックしながら左に動かすとページを戻り、右クリックしながら右に動かすと進みます。 (実験的)",
+        "wheelGesturesEnabled": "ホイールジェスチャーを有効にする",
         "actions": {
             "gecko-back": "戻る",
             "gecko-forward": "進む",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/ko-KR.json b/browser-features/pages-settings/src/lib/i18n/locales/ko-KR.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/lt-LT.json b/browser-features/pages-settings/src/lib/i18n/locales/lt-LT.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/nl-NL.json b/browser-features/pages-settings/src/lib/i18n/locales/nl-NL.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/nn-NO.json b/browser-features/pages-settings/src/lib/i18n/locales/nn-NO.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/pl-PL.json b/browser-features/pages-settings/src/lib/i18n/locales/pl-PL.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/pt-BR.json b/browser-features/pages-settings/src/lib/i18n/locales/pt-BR.json
@@ -476,6 +476,7 @@
         "actionDescription": "Descrição do gesto",
         "rockerGesturesEnabled": "Ativar gestos de balanço",
         "rockerGesturesDescription": "Clique com o botão direito do mouse e mova para a esquerda para voltar, clique com o botão direito do mouse e mova para a direita para avançar. (experimental)",
+        "wheelGesturesEnabled": "Ativar gestos de roda",
         "actions": {
             "gecko-back": "Voltar",
             "gecko-forward": "Avançar",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/pt-PT.json b/browser-features/pages-settings/src/lib/i18n/locales/pt-PT.json
@@ -476,6 +476,7 @@
         "actionDescription": "Descrição do gesto",
         "rockerGesturesEnabled": "Ativar os gestos de baloiço",
         "rockerGesturesDescription": "Clique com o botão direito do rato e mova para a esquerda para voltar atrás, clique com o botão direito do rato e mova para a direita para avançar. (Experimental)",
+        "wheelGesturesEnabled": "Ativar gestos de roda",
         "actions": {
             "gecko-back": "Voltar atrás",
             "gecko-forward": "Avançar",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/ru-RU.json b/browser-features/pages-settings/src/lib/i18n/locales/ru-RU.json
@@ -476,6 +476,7 @@
         "actionDescription": "Описание жеста",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/sv-SE.json b/browser-features/pages-settings/src/lib/i18n/locales/sv-SE.json
@@ -476,6 +476,7 @@
         "actionDescription": "Beskrivning av gest",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Gå tillbaka",
             "gecko-forward": "Gå framåt",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/th-TH.json b/browser-features/pages-settings/src/lib/i18n/locales/th-TH.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/tr-TR.json b/browser-features/pages-settings/src/lib/i18n/locales/tr-TR.json
@@ -476,6 +476,7 @@
         "actionDescription": "Hareketin açıklaması",
         "rockerGesturesEnabled": "Rocker hareketlerini etkinleştirin",
         "rockerGesturesDescription": "Geri gitmek için sağ tıklayın ve sola hareket edin, ileri gitmek için sağ tıklayın ve sağa hareket edin. (Deneysel)",
+        "wheelGesturesEnabled": "Tekerlek hareketlerini etkinleştirin",
         "actions": {
             "gecko-back": "Geri",
             "gecko-forward": "İleri",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/uk-UA.json b/browser-features/pages-settings/src/lib/i18n/locales/uk-UA.json
@@ -476,6 +476,7 @@
         "actionDescription": "Опис жесту",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Повернутися",
             "gecko-forward": "Вперед",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/vi-VN.json b/browser-features/pages-settings/src/lib/i18n/locales/vi-VN.json
@@ -476,6 +476,7 @@
         "actionDescription": "Description of the gesture",
         "rockerGesturesEnabled": "Enable rocker gestures",
         "rockerGesturesDescription": "Right-click and move left to go back, right-click and move right to go forward. (Experimental)",
+        "wheelGesturesEnabled": "Enable wheel gestures",
         "actions": {
             "gecko-back": "Go Back",
             "gecko-forward": "Go Forward",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/zh-CN.json b/browser-features/pages-settings/src/lib/i18n/locales/zh-CN.json
@@ -476,6 +476,7 @@
         "actionDescription": "手势说明",
         "rockerGesturesEnabled": "启用摇杆手势",
         "rockerGesturesDescription": "右键单击并向左移动以返回，右键单击并向右移动以前进。(实验性)",
+        "wheelGesturesEnabled": "启用滚轮手势",
         "actions": {
             "gecko-back": "转到上一页",
             "gecko-forward": "转到下一页",

diff --git a/browser-features/pages-settings/src/lib/i18n/locales/zh-TW.json b/browser-features/pages-settings/src/lib/i18n/locales/zh-TW.json
@@ -476,6 +476,7 @@
         "actionDescription": "手勢說明",
         "rockerGesturesEnabled": "啟用搖桿手勢",
         "rockerGesturesDescription": "按一下滑鼠右鍵並向左移動可返回，按一下滑鼠右鍵並向右移動可向前。(實驗性質)",
+        "wheelGesturesEnabled": "啟用滾輪手勢",
         "actions": {
             "gecko-back": "返回",
             "gecko-forward": "前進",