fix: zooming handling

jagenjo · Jan 13, 2024 · 2a752b5 · 2a752b5
1 parent f0792b9
commit 2a752b5
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/src/litegraph.js b/src/litegraph.js
@@ -7002,30 +7002,27 @@ LGraphNode.prototype.executeAction = function(action)
             return;
         }
 
-        const isTouchPad = !!e.wheelDeltaY && e.wheelDeltaY === e.deltaY * -3
+        const isTouchpadPan = !!e.wheelDeltaY && e.wheelDeltaY === e.deltaY * -3
 
-        if(isTouchPad) {
-            const isNatural = event.webkitDirectionInvertedFromDevice
-            if(e.ctrlKey) {
-                let scale = this.ds.scale;
-                let deltaS = Math.exp(-e.deltaY / 100);
-                scale = isNatural ? scale / deltaS : scale * deltaS
-                this.ds.changeScale(scale, [x, y]);
-            }
-
-            const naturalFix = isNatural ? 1 : -1
+        if(isTouchpadPan) { // Touchpad pan
+            const naturalFix = -1;
             this.ds.offset[0] += e.deltaX / this.ds.scale * naturalFix;
             this.ds.offset[1] += e.deltaY / this.ds.scale * naturalFix;
             this.dirty_canvas = true;
             this.dirty_bgcanvas = true;
         } else {
-            const delta = e.wheelDeltaY != null ? e.wheelDeltaY : e.detail * -60;
-            this.adjustMouseEvent(e);
             let scale = this.ds.scale;
-            if (delta > 0) {
-                scale *= 1.1;
-            } else if (delta < 0) {
-                scale *= 1 / 1.1;
+            if(Math.abs(e.deltaY) < 10) { // Treat smaller delta as touchpad zoom
+                let deltaS = Math.exp(-e.deltaY / 50);
+                scale = scale * deltaS;
+            } else { // Mouse zoom
+                const delta = e.wheelDeltaY != null ? e.wheelDeltaY : e.detail * -60;
+                this.adjustMouseEvent(e);
+                if (delta > 0) {
+                    scale *= 1.1;
+                } else if (delta < 0) {
+                    scale *= 1 / 1.1;
+                }
             }
 
             //this.setZoom( scale, [ e.clientX, e.clientY ] );