Skip to content

The swiss army knife of lossless video/audio editing

Detect trackpad pinch and give it higher zoom sensitivity

Claudeb25558799e83
diff --git a/src/renderer/src/hooks/useTimelineScroll.ts b/src/renderer/src/hooks/useTimelineScroll.ts
index 541474f4..3e88402b 100644
--- a/src/renderer/src/hooks/useTimelineScroll.ts
+++ b/src/renderer/src/hooks/useTimelineScroll.ts
@@ -1,5 +1,5 @@
import type { WheelEventHandler } from 'react';
-import { useCallback } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
import { t } from 'i18next';
import normalizeWheel from './normalizeWheel';
@@ -16,6 +16,32 @@ export const getModifierKeyNames = () => ({
export const getModifier = (key: ModifierKey) => getModifierKeyNames()[key];
+// Chromium sends trackpad pinch as a wheel event with ctrlKey, even though ctrl is not held.
+// So we track whether ctrl is actually held, using events that carry the real modifier state.
+// undefined means unknown (e.g. before any event, or after the window lost focus while ctrl may still be held)
+function useIsCtrlHeldRef() {
+ const isCtrlHeldRef = useRef<boolean | undefined>(undefined);
+
+ useEffect(() => {
+ const onEvent = (e: KeyboardEvent | PointerEvent) => { isCtrlHeldRef.current = e.ctrlKey; };
+ const onBlur = () => { isCtrlHeldRef.current = undefined; };
+ window.addEventListener('keydown', onEvent, true);
+ window.addEventListener('keyup', onEvent, true);
+ window.addEventListener('pointermove', onEvent, true);
+ window.addEventListener('pointerdown', onEvent, true);
+ window.addEventListener('blur', onBlur);
+ return () => {
+ window.removeEventListener('keydown', onEvent, true);
+ window.removeEventListener('keyup', onEvent, true);
+ window.removeEventListener('pointermove', onEvent, true);
+ window.removeEventListener('pointerdown', onEvent, true);
+ window.removeEventListener('blur', onBlur);
+ };
+ }, []);
+
+ return isCtrlHeldRef;
+}
+
function useTimelineScroll({ wheelSensitivity, mouseWheelZoomModifierKey, mouseWheelFrameSeekModifierKey, mouseWheelKeyframeSeekModifierKey, invertTimelineScroll, zoomRel, seekRel, shortStep, seekClosestKeyframe }: {
wheelSensitivity: number,
mouseWheelZoomModifierKey: ModifierKey,
@@ -27,11 +53,15 @@ function useTimelineScroll({ wheelSensitivity, mouseWheelZoomModifierKey, mouseW
shortStep: (a: number) => void,
seekClosestKeyframe: (a: number) => void,
}) {
+ const isCtrlHeldRef = useIsCtrlHeldRef();
+
const onWheel = useCallback<WheelEventHandler<Element>>((wheelEvent) => {
const { pixelX, pixelY } = normalizeWheel(wheelEvent);
const { ctrlKey, shiftKey, altKey, metaKey } = wheelEvent;
+ // if unknown, assume ctrl is really held (not a pinch)
+ const isPinch = ctrlKey && isCtrlHeldRef.current === false;
- const action = getTimelineWheelAction({ pixelX, pixelY, modifiers: { ctrlKey, shiftKey, altKey, metaKey }, wheelSensitivity, mouseWheelZoomModifierKey, mouseWheelFrameSeekModifierKey, mouseWheelKeyframeSeekModifierKey, invertTimelineScroll });
+ const action = getTimelineWheelAction({ pixelX, pixelY, modifiers: { ctrlKey, shiftKey, altKey, metaKey }, isPinch, wheelSensitivity, mouseWheelZoomModifierKey, mouseWheelFrameSeekModifierKey, mouseWheelKeyframeSeekModifierKey, invertTimelineScroll });
switch (action.type) {
case 'zoom': { zoomRel(action.amount); break; }
@@ -40,7 +70,7 @@ function useTimelineScroll({ wheelSensitivity, mouseWheelZoomModifierKey, mouseW
case 'seek': { seekRel(action.amount); break; }
default: { const exhaustive: never = action; throw new Error(`Unknown wheel action ${JSON.stringify(exhaustive)}`); }
}
- }, [invertTimelineScroll, mouseWheelZoomModifierKey, mouseWheelFrameSeekModifierKey, mouseWheelKeyframeSeekModifierKey, zoomRel, wheelSensitivity, shortStep, seekClosestKeyframe, seekRel]);
+ }, [isCtrlHeldRef, invertTimelineScroll, mouseWheelZoomModifierKey, mouseWheelFrameSeekModifierKey, mouseWheelKeyframeSeekModifierKey, zoomRel, wheelSensitivity, shortStep, seekClosestKeyframe, seekRel]);
return onWheel;
}
diff --git a/src/renderer/src/timelineWheel.test.ts b/src/renderer/src/timelineWheel.test.ts
index ffb804cb..ed0a51eb 100644
--- a/src/renderer/src/timelineWheel.test.ts
+++ b/src/renderer/src/timelineWheel.test.ts
@@ -5,10 +5,11 @@ import type { ModifierKey } from '../../common/types';
const noModifiers = { ctrlKey: false, shiftKey: false, altKey: false, metaKey: false };
-function getAction({ pixelX = 0, pixelY = 0, modifiers = {}, invertTimelineScroll = false, zoomKey = 'ctrl', frameSeekKey = 'alt', keyframeSeekKey = 'shift' }: {
+function getAction({ pixelX = 0, pixelY = 0, modifiers = {}, isPinch = false, invertTimelineScroll = false, zoomKey = 'ctrl', frameSeekKey = 'alt', keyframeSeekKey = 'shift' }: {
pixelX?: number,
pixelY?: number,
modifiers?: Partial<typeof noModifiers>,
+ isPinch?: boolean,
invertTimelineScroll?: boolean,
zoomKey?: ModifierKey,
frameSeekKey?: ModifierKey,
@@ -18,6 +19,7 @@ function getAction({ pixelX = 0, pixelY = 0, modifiers = {}, invertTimelineScrol
pixelX,
pixelY,
modifiers: { ...noModifiers, ...modifiers },
+ isPinch,
wheelSensitivity: 1,
mouseWheelZoomModifierKey: zoomKey,
mouseWheelFrameSeekModifierKey: frameSeekKey,
@@ -37,7 +39,12 @@ describe('zoom', () => {
expect(getAction({ pixelY: -100, modifiers: { metaKey: true }, zoomKey: 'meta' })).toEqual({ type: 'zoom', amount: 40 });
});
- test('ctrl with other zoom modifier seeks', () => {
+ test('trackpad pinch zooms with higher sensitivity, also if zoom modifier is not ctrl', () => {
+ expect(getAction({ pixelY: -10, modifiers: { ctrlKey: true }, isPinch: true })).toEqual({ type: 'zoom', amount: 20 });
+ expect(getAction({ pixelY: -10, modifiers: { ctrlKey: true }, isPinch: true, zoomKey: 'meta', frameSeekKey: 'ctrl' })).toEqual({ type: 'zoom', amount: 20 });
+ });
+
+ test('ctrl actually held with other zoom modifier seeks, as before', () => {
expect(getAction({ pixelY: -100, modifiers: { ctrlKey: true }, zoomKey: 'meta' })).toEqual({ type: 'seek', amount: 20 });
expect(getAction({ pixelY: -100, modifiers: { ctrlKey: true }, zoomKey: 'meta', frameSeekKey: 'ctrl' })).toEqual({ type: 'frameSeek', direction: 1 });
});
diff --git a/src/renderer/src/timelineWheel.ts b/src/renderer/src/timelineWheel.ts
index 29952853..11d04bec 100644
--- a/src/renderer/src/timelineWheel.ts
+++ b/src/renderer/src/timelineWheel.ts
@@ -7,16 +7,21 @@ export const keyMap = {
meta: 'metaKey',
} as const;
+// Trackpad pinch deltas are much smaller than mouse wheel deltas
+const pinchSensitivityFactor = 5;
+
export type WheelAction =
| { type: 'zoom', amount: number }
| { type: 'frameSeek', direction: number }
| { type: 'keyframeSeek', direction: number }
| { type: 'seek', amount: number };
-export function getTimelineWheelAction({ pixelX, pixelY, modifiers, wheelSensitivity, mouseWheelZoomModifierKey, mouseWheelFrameSeekModifierKey, mouseWheelKeyframeSeekModifierKey, invertTimelineScroll }: {
+export function getTimelineWheelAction({ pixelX, pixelY, modifiers, isPinch, wheelSensitivity, mouseWheelZoomModifierKey, mouseWheelFrameSeekModifierKey, mouseWheelKeyframeSeekModifierKey, invertTimelineScroll }: {
pixelX: number,
pixelY: number,
modifiers: Record<typeof keyMap[ModifierKey], boolean>,
+ // Chromium sends trackpad pinch as a wheel event with ctrlKey, without ctrl actually being held
+ isPinch: boolean,
wheelSensitivity: number,
mouseWheelZoomModifierKey: ModifierKey,
mouseWheelFrameSeekModifierKey: ModifierKey,
@@ -27,7 +32,9 @@ export function getTimelineWheelAction({ pixelX, pixelY, modifiers, wheelSensiti
// Wheel up / pinch out (negative delta) zooms in, like ctrl+wheel in browsers. Not affected by invertTimelineScroll, which is for seeking only.
// https://github.com/mifi/lossless-cut/issues/2703 https://github.com/mifi/lossless-cut/issues/2962
- const getZoomAction = (delta: number): WheelAction => ({ type: 'zoom', amount: -delta * wheelSensitivity * 0.4 });
+ const getZoomAction = (delta: number, factor = 1): WheelAction => ({ type: 'zoom', amount: -delta * wheelSensitivity * 0.4 * factor });
+
+ if (isPinch) return getZoomAction(pixelY, pinchSensitivityFactor);
if (isPressed(mouseWheelZoomModifierKey)) return getZoomAction(pixelY);