Skip to content

Record your screen, ship a demo. Free and open-source, GPU-accelerated, no watermarks, no subscriptions. Windows, macOS, Linux. Actively maintained.

feat(camera): zoom the webcam by its frame's corners

EtienneLescot9b6c488adf14
diff --git a/src/components/ai-edition/NewEditorShell.module.css b/src/components/ai-edition/NewEditorShell.module.css
index 23edd1379..b79f87c02 100644
--- a/src/components/ai-edition/NewEditorShell.module.css
+++ b/src/components/ai-edition/NewEditorShell.module.css
@@ -1192,15 +1192,54 @@ textarea.control {
.framingCrop {
position: absolute;
box-sizing: border-box;
- border: 2px solid #fff;
- border-radius: 6px;
+ border: 1.5px solid rgb(255 255 255 / 0.9);
+ border-radius: 4px;
/* Dims everything outside the frame without a second element. */
box-shadow: 0 0 0 999px rgb(0 0 0 / 0.45);
touch-action: none;
}
+/* A corner bracket, the shape every photo cropper uses: thick, white and shadowed so it reads on
+ a bright wall as on a dark one, and sitting in a 28px square that a pointer finds without aiming. */
+.framingHandle {
+ position: absolute;
+ width: 28px;
+ height: 28px;
+ touch-action: none;
+}
+.framingHandle::before {
+ content: "";
+ position: absolute;
+ width: 14px;
+ height: 14px;
+ border: 0 solid #fff;
+ filter: drop-shadow(0 0 1.5px rgb(0 0 0 / 0.7));
+ transition: width var(--motion-fast) var(--ease), height var(--motion-fast) var(--ease);
+}
+.framingHandle:hover::before { width: 17px; height: 17px; }
+.framingHandle[data-corner="nw"] { top: -8px; left: -8px; cursor: nwse-resize; }
+.framingHandle[data-corner="ne"] { top: -8px; right: -8px; cursor: nesw-resize; }
+.framingHandle[data-corner="sw"] { bottom: -8px; left: -8px; cursor: nesw-resize; }
+.framingHandle[data-corner="se"] { bottom: -8px; right: -8px; cursor: nwse-resize; }
+.framingHandle[data-corner="nw"]::before { top: 8px; left: 8px; border-width: 3.5px 0 0 3.5px; border-top-left-radius: 5px; }
+.framingHandle[data-corner="ne"]::before { top: 8px; right: 8px; border-width: 3.5px 3.5px 0 0; border-top-right-radius: 5px; }
+.framingHandle[data-corner="sw"]::before { bottom: 8px; left: 8px; border-width: 0 0 3.5px 3.5px; border-bottom-left-radius: 5px; }
+.framingHandle[data-corner="se"]::before { bottom: 8px; right: 8px; border-width: 0 3.5px 3.5px 0; border-bottom-right-radius: 5px; }
+/* The zoom, on the picture it zooms. Its own dark ground, like any label over a photo. */
+.framingZoom {
+ position: absolute;
+ right: 8px;
+ bottom: 8px;
+ padding: 3px 8px;
+ border-radius: 999px;
+ background: rgb(0 0 0 / 0.55);
+ color: #fff;
+ font: 600 11px/1.2 var(--font-body);
+ font-variant-numeric: tabular-nums;
+ pointer-events: none;
+}
.framingCrop[data-movable="true"] { cursor: grab; }
.framingCrop[data-movable="true"]:active { cursor: grabbing; }
-.framingCrop:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
+.framingCrop:focus-visible { outline: 2px solid var(--accent); outline-offset: 3px; }
.framingHint {
margin: 0;
font: 400 12px/1.5 var(--font-body);
diff --git a/src/components/ai-edition/RightPanes.layout.test.tsx b/src/components/ai-edition/RightPanes.layout.test.tsx
index 1a3d054c0..4a9ff4071 100644
--- a/src/components/ai-edition/RightPanes.layout.test.tsx
+++ b/src/components/ai-edition/RightPanes.layout.test.tsx
@@ -7,7 +7,7 @@
import "@testing-library/jest-dom";
import { cleanup, fireEvent, render, screen, within } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
-import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { I18nProvider } from "@/contexts/I18nContext";
import { LOCALE_STORAGE_KEY } from "@/i18n/config";
import { type AxcutDocument, createEmptyDocument } from "@/lib/ai-edition/schema";
@@ -205,11 +205,9 @@ describe("LayoutPane picture-in-picture camera", () => {
// zoom the crop IS the frame, so its offset is 0 for every pan the user could have chosen.
// A trip down to 100% therefore erased the framing rather than suspending it.
describe("LayoutPane webcam crop pan", () => {
- const zoom = () => screen.getByRole("slider", { name: "Zoom" });
- // The frame on the camera picture: dragged by pointer, moved 5% a step by the arrows.
+ // The frame on the camera picture: dragged by pointer, moved 5% a step by the arrows,
+ // zoomed 10% a step by + and -, and by its corners.
const frame = () => screen.getByRole("slider", { name: "Webcam crop" });
- const set = (slider: HTMLElement, value: number) =>
- fireEvent.change(slider, { target: { value: String(value) } });
const press = (key: string, times: number) => {
for (let i = 0; i < times; i++) fireEvent.keyDown(frame(), { key });
};
@@ -218,36 +216,44 @@ describe("LayoutPane webcam crop pan", () => {
webcamCropRegion: { x: number; y: number; width: number; height: number };
webcamCropPan: { x: number; y: number };
};
+ /** A project already framed at 200%, centred. */
+ const at200 = () => {
+ const doc = seedProject(true);
+ return {
+ ...doc,
+ legacyEditor: {
+ ...doc.legacyEditor,
+ webcamCropRegion: { x: 0.25, y: 0.25, width: 0.5, height: 0.5 },
+ webcamCropPan: { x: 0.5, y: 0.5 },
+ },
+ };
+ };
it("keeps the pan across a round trip through 100% zoom", () => {
- renderLayout(seedProject(true));
+ renderLayout(at200());
- set(zoom(), 200);
press("ArrowRight", 5);
expect(frame()).toHaveAttribute("aria-valuetext", "75%, 50%");
- set(zoom(), 100);
- // Nowhere to pan at full frame, so the frame is correctly out of reach, and says why...
- expect(frame()).toHaveAttribute("aria-disabled", "true");
- expect(screen.getByText(/zoom in, then drag the frame/i)).toBeInTheDocument();
+ press("-", 10);
+ expect(storedCrop().webcamCropRegion.width).toBe(1);
+ // Nowhere to pan at full frame, so the arrows do nothing there...
press("ArrowLeft", 3);
expect(storedCrop().webcamCropPan.x).toBeCloseTo(0.75);
- set(zoom(), 200);
+ press("+", 8);
// ...but the intent survived the trip.
expect(frame()).toHaveAttribute("aria-valuetext", "75%, 50%");
});
- it("does not move the pan while the zoom slider is dragged", () => {
+ it("does not move the pan while zooming", () => {
// The old clamp squeezed the rect's offset toward the near edge as the window grew,
// so the pan crept on its own while the picture stayed put.
- renderLayout(seedProject(true));
-
- set(zoom(), 200);
+ renderLayout(at200());
press("ArrowRight", 5);
- for (const pct of [180, 150, 120, 110, 101]) {
- set(zoom(), pct);
+ for (let i = 0; i < 6; i++) {
+ press("-", 1);
expect(frame()).toHaveAttribute("aria-valuetext", "75%, 50%");
}
});
@@ -255,9 +261,7 @@ describe("LayoutPane webcam crop pan", () => {
it("moves the frame on the axis each arrow names", () => {
// Up/down and left/right differ by one character in the handler. Without this, a
// vertical arrow wired to x would pass every other test in this block.
- renderLayout(seedProject(true));
-
- set(zoom(), 200);
+ renderLayout(at200());
press("ArrowDown", 6);
expect(storedCrop().webcamCropPan.y).toBeCloseTo(0.8);
@@ -268,18 +272,42 @@ describe("LayoutPane webcam crop pan", () => {
});
it("puts the crop where the pan says, at any zoom", () => {
- renderLayout(seedProject(true));
-
- set(zoom(), 200);
+ renderLayout(at200());
press("ArrowRight", 20);
// Hard against the right edge: a half-width window starts halfway across.
let crop = storedCrop().webcamCropRegion;
expect(crop.width).toBeCloseTo(0.5);
expect(crop.x).toBeCloseTo(0.5);
- set(zoom(), 400);
- // Clamped to the slider's 300% ceiling, so a third of the frame, still hard right.
+ press("+", 20);
+ // Held at 300%, so a third of the frame, still hard right.
crop = storedCrop().webcamCropRegion;
+ expect(crop.width).toBeCloseTo(1 / 3);
expect(crop.x).toBeCloseTo(1 - crop.width);
});
+
+ // A crop tool's contract: the corner you pull moves, the one across stays, and the frame
+ // keeps the camera's shape, so its size is the only thing a corner changes.
+ it("zooms by a corner, keeping the opposite corner and the shape", () => {
+ const box = { left: 0, top: 0, right: 200, bottom: 112.5, width: 200, height: 112.5 };
+ const spy = vi
+ .spyOn(HTMLElement.prototype, "getBoundingClientRect")
+ .mockReturnValue({ ...box, x: 0, y: 0, toJSON: () => box } as DOMRect);
+ try {
+ renderLayout(at200());
+ const corner = document.querySelector('[data-corner="se"]') as HTMLElement;
+ fireEvent.pointerDown(corner, { clientX: 150, clientY: 84 });
+ fireEvent.pointerMove(corner, { clientX: 190, clientY: 84 });
+ fireEvent.pointerUp(corner, { clientX: 190, clientY: 84 });
+
+ const crop = storedCrop().webcamCropRegion;
+ expect(crop.x).toBeCloseTo(0.25);
+ expect(crop.y).toBeCloseTo(0.25);
+ expect(crop.width).toBeCloseTo(0.7);
+ expect(crop.height).toBeCloseTo(0.7);
+ expect(screen.getByText("143%")).toBeInTheDocument();
+ } finally {
+ spy.mockRestore();
+ }
+ });
});
diff --git a/src/components/ai-edition/RightPanes.tsx b/src/components/ai-edition/RightPanes.tsx
index 866641d13..dbe68db6e 100644
--- a/src/components/ai-edition/RightPanes.tsx
+++ b/src/components/ai-edition/RightPanes.tsx
@@ -2956,7 +2956,6 @@ export function LayoutPane() {
return null;
}, [document]);
const webcamCrop = settings.webcamCropRegion;
- const cropZoomPct = Math.round(100 / webcamCrop.width);
// Read straight off the pan, not back out of the rect. The rect cannot answer at 100%
// zoom — it is the whole frame, so its offset is 0 whatever the user chose — and it gave
// a drifting answer on the way there, because the offset gets squeezed toward the near
@@ -2969,15 +2968,9 @@ export function LayoutPane() {
width: size,
height: size,
});
- const setCropZoom = (zoomPct: number) => {
- const size = 100 / Math.max(100, zoomPct);
- // A pure function of (pan, size): the pan is never re-derived from the rect this
- // writes, so dragging the zoom back and forth returns the framing it started from.
- setLive({ webcamCropRegion: cropRegionFor(size, cropPan) });
- };
- const setCropPan = (pan: { x: number; y: number }) => {
+ const setCropFrame = (size: number, pan: { x: number; y: number }) => {
// One patch for both, so a half-written pair can never reach disk.
- setLive({ webcamCropPan: pan, webcamCropRegion: cropRegionFor(webcamCrop.width, pan) });
+ setLive({ webcamCropPan: pan, webcamCropRegion: cropRegionFor(size, pan) });
};
return (
<Pane title={ts("layout.title")} icon={<Camera size={16} />} helpText={helpText}>
@@ -3215,88 +3208,121 @@ export function LayoutPane() {
<div className={styles.sectionLabel}>{ts("layout.webcamFraming")}</div>
<WebcamFraming
label={ts("layout.webcamFraming")}
+ zoomLabel={ts("layout.webcamCropZoom")}
src={cameraSrc}
crop={webcamCrop}
pan={cropPan}
disabled={layoutControlsDisabled}
- hint={
- webcamCrop.width < 0.999
- ? ts("layout.webcamFramingDrag")
- : ts("layout.webcamFramingZoomFirst")
- }
- onPanLive={setCropPan}
+ hint={ts("layout.webcamFramingDrag")}
+ onFrameLive={setCropFrame}
onCommit={() => void commit()}
/>
- <div className={styles.sliderGrid}>
- <SliderCell
- label={ts("layout.webcamCropZoom")}
- value={cropZoomPct}
- min={100}
- max={300}
- suffix="%"
- disabled={layoutControlsDisabled}
- onChange={setCropZoom}
- onCommit={() => void commit()}
- />
- </div>
</Pane>
);
}
-/** Où la webcam cadre, réglé à la main : une vignette de la caméra, le cadre gardé posé dessus,
- * et on glisse le cadre pour choisir ce qu'elle montre. Remplace deux curseurs de déplacement
- * qui ne disaient pas où l'on était dans l'image, et qui à 100 % ne déplaçaient rien. Le zoom
- * reste un curseur, sous la vignette : c'est lui qui donne au cadre la place de bouger.
+/** The tightest the frame gets: a third of the picture, 300% zoom, the old slider's end. */
+const MIN_CROP_SIZE = 1 / 3;
+const FRAME_CORNERS = ["nw", "ne", "sw", "se"] as const;
+type FrameCorner = (typeof FRAME_CORNERS)[number];
+
+/** Où la webcam cadre, réglé à la main : une vignette de la caméra, le cadre gardé posé dessus.
+ * Le cadre EST le réglage : on le glisse pour choisir ce qu'il montre, on tire un coin pour
+ * zoomer, comme n'importe quel outil de recadrage. Il garde la forme de la caméra, que la
+ * forme choisie plus haut recoupe ensuite ; un coin ne change donc qu'une chose, la taille.
*
* Le déplacement s'exprime en `pan` (0–1 par axe) et non en position du cadre, comme le reste
* du panneau (#412) : c'est ce qui garde le cadrage à travers un passage par 100 %. Les
- * flèches déplacent de 5 % et enregistrent à chaque pas ; le glisser écrit en direct et
- * enregistre au relâchement, comme un curseur. */
+ * flèches déplacent de 5 %, + et − zooment de 10 %, et chaque pas enregistre ; les gestes
+ * écrivent en direct et enregistrent au relâchement, comme un curseur. */
function WebcamFraming({
label,
+ zoomLabel,
src,
crop,
pan,
disabled,
hint,
- onPanLive,
+ onFrameLive,
onCommit,
}: {
label: string;
+ zoomLabel: string;
src: string | null;
crop: { x: number; y: number; width: number; height: number };
pan: { x: number; y: number };
disabled: boolean;
hint: string;
- onPanLive: (pan: { x: number; y: number }) => void;
+ onFrameLive: (size: number, pan: { x: number; y: number }) => void;
onCommit: () => void;
}) {
const boxRef = useRef<HTMLDivElement | null>(null);
- const dragRef = useRef<{ x: number; y: number; pan: { x: number; y: number } } | null>(null);
+ const gestureRef = useRef<
+ | { kind: "move"; x: number; y: number; pan: { x: number; y: number } }
+ | { kind: "resize"; anchor: { x: number; y: number }; corner: FrameCorner }
+ | null
+ >(null);
// The camera's own shape, read from ITS metadata: tied to the source it was read from, so
// another camera starts over at 16:9, and the picture stays hidden until its own shape is
// known rather than showing a frame in the previous one's.
const [metadata, setMetadata] = useState<{ src: string; aspect: number } | null>(null);
const ready = src !== null && metadata?.src === src;
const aspect = ready ? metadata.aspect : 16 / 9;
- const movable = !disabled && crop.width < 0.999;
+ const size = crop.width;
+ const movable = !disabled && size < 0.999;
const clamp01 = (v: number) => Math.min(1, Math.max(0, v));
- const onPointerMove = (e: ReactPointerEvent<HTMLDivElement>) => {
- const drag = dragRef.current;
+ /** A frame of `next` size at (x, y), kept inside the picture, written as size and pan. */
+ const place = (next: number, x: number, y: number) => {
+ const s = Math.min(1, Math.max(MIN_CROP_SIZE, next));
+ const free = 1 - s;
+ // At 100% there is no room to pan in, and the pan it had is what comes back.
+ const nextPan =
+ free < 0.001
+ ? pan
+ : {
+ x: clamp01(Math.min(free, Math.max(0, x)) / free),
+ y: clamp01(Math.min(free, Math.max(0, y)) / free),
+ };
+ onFrameLive(s, nextPan);
+ };
+ /** Keyboard zoom keeps the pan, like the slider it replaces (#412): out to 100% and back in
+ * returns the framing it started from, where zooming about the centre would reset it. */
+ const zoomBy = (factor: number) =>
+ onFrameLive(Math.min(1, Math.max(MIN_CROP_SIZE, size / factor)), pan);
+
+ const onPointerMove = (e: ReactPointerEvent<HTMLElement>) => {
+ const gesture = gestureRef.current;
const box = boxRef.current?.getBoundingClientRect();
- if (!drag || !box || box.width === 0 || box.height === 0) return;
- // The frame travels over (1 - size) of the picture, so a pixel of drag is worth more pan
- // the bigger the frame is.
- const free = 1 - crop.width;
- onPanLive({
- x: clamp01(drag.pan.x + (e.clientX - drag.x) / (box.width * free)),
- y: clamp01(drag.pan.y + (e.clientY - drag.y) / (box.height * free)),
- });
+ if (!gesture || !box || box.width === 0 || box.height === 0) return;
+ if (gesture.kind === "move") {
+ // The frame travels over (1 - size) of the picture, so a pixel of drag is worth more
+ // pan the bigger the frame is.
+ const free = 1 - size;
+ onFrameLive(size, {
+ x: clamp01(gesture.pan.x + (e.clientX - gesture.x) / (box.width * free)),
+ y: clamp01(gesture.pan.y + (e.clientY - gesture.y) / (box.height * free)),
+ });
+ return;
+ }
+ // The opposite corner stays put and the frame keeps the camera's shape: its size is
+ // the larger of the two distances from that corner to the pointer.
+ const { anchor, corner } = gesture;
+ const px = (e.clientX - box.left) / box.width;
+ const py = (e.clientY - box.top) / box.height;
+ const next = Math.min(
+ 1,
+ Math.max(MIN_CROP_SIZE, Math.abs(px - anchor.x), Math.abs(py - anchor.y)),
+ );
+ place(
+ next,
+ corner.endsWith("w") ? anchor.x - next : anchor.x,
+ corner.startsWith("n") ? anchor.y - next : anchor.y,
+ );
};
- const endDrag = () => {
- if (!dragRef.current) return;
- dragRef.current = null;
+ const endGesture = () => {
+ if (!gestureRef.current) return;
+ gestureRef.current = null;
onCommit();
};
@@ -3332,23 +3358,32 @@ function WebcamFraming({
aria-valuemax={100}
aria-valuenow={Math.round(pan.x * 100)}
aria-valuetext={`${Math.round(pan.x * 100)}%, ${Math.round(pan.y * 100)}%`}
- aria-disabled={!movable}
- tabIndex={movable ? 0 : -1}
+ aria-disabled={disabled}
+ aria-keyshortcuts="+ -"
+ tabIndex={disabled ? -1 : 0}
style={{
left: `${crop.x * 100}%`,
top: `${crop.y * 100}%`,
- width: `${crop.width * 100}%`,
+ width: `${size * 100}%`,
height: `${crop.height * 100}%`,
}}
onPointerDown={(e) => {
if (!movable) return;
e.currentTarget.setPointerCapture?.(e.pointerId);
- dragRef.current = { x: e.clientX, y: e.clientY, pan };
+ gestureRef.current = { kind: "move", x: e.clientX, y: e.clientY, pan };
}}
onPointerMove={onPointerMove}
- onPointerUp={endDrag}
- onPointerCancel={endDrag}
+ onPointerUp={endGesture}
+ onPointerCancel={endGesture}
onKeyDown={(e) => {
+ if (disabled) return;
+ if (e.key === "+" || e.key === "=" || e.key === "-") {
+ e.preventDefault();
+ e.nativeEvent.stopPropagation();
+ zoomBy(e.key === "-" ? 1 / 1.1 : 1.1);
+ onCommit();
+ return;
+ }
if (!movable) return;
const step = 0.05;
const delta =
@@ -3365,10 +3400,40 @@ function WebcamFraming({
// The editor shell seeks on the arrows, from WINDOW: keep them here.
e.preventDefault();
e.nativeEvent.stopPropagation();
- onPanLive({ x: clamp01(pan.x + delta.x), y: clamp01(pan.y + delta.y) });
+ onFrameLive(size, { x: clamp01(pan.x + delta.x), y: clamp01(pan.y + delta.y) });
onCommit();
}}
- />
+ >
+ {disabled
+ ? null
+ : FRAME_CORNERS.map((corner) => (
+ <span
+ key={corner}
+ className={styles.framingHandle}
+ data-corner={corner}
+ aria-hidden="true"
+ onPointerDown={(e) => {
+ // Not a move: the frame's own handler would start one.
+ e.stopPropagation();
+ e.currentTarget.setPointerCapture?.(e.pointerId);
+ gestureRef.current = {
+ kind: "resize",
+ corner,
+ anchor: {
+ x: corner.endsWith("w") ? crop.x + size : crop.x,
+ y: corner.startsWith("n") ? crop.y + crop.height : crop.y,
+ },
+ };
+ }}
+ onPointerMove={onPointerMove}
+ onPointerUp={endGesture}
+ onPointerCancel={endGesture}
+ />
+ ))}
+ </div>
+ <span className={styles.framingZoom} title={zoomLabel}>
+ {Math.round(100 / size)}%
+ </span>
</div>
<p className={styles.framingHint}>{hint}</p>
</div>
diff --git a/src/i18n/locales/ar/settings.json b/src/i18n/locales/ar/settings.json
index a4d890b85..a09f0bd02 100644
--- a/src/i18n/locales/ar/settings.json
+++ b/src/i18n/locales/ar/settings.json
@@ -274,8 +274,7 @@
"help": "طريقة دمج كاميرا الويب مع الشاشة: صورة داخل صورة، أو تكديس عمودي، أو إطار مزدوج، والشكل والاستدارة والحجم والموضع والانعكاس.",
"mirrorWebcam": "عكس كاميرا الويب",
"webcamFraming": "تأطير كاميرا الويب",
- "webcamFramingDrag": "اسحب الإطار لاختيار ما تعرضه الكاميرا.",
- "webcamFramingZoomFirst": "كبّر الصورة ثم اسحب الإطار لاختيار ما تعرضه الكاميرا.",
+ "webcamFramingDrag": "اسحب الإطار لتحريكه، واسحب زاويةً للتكبير.",
"shapes": {
"rectangle": "مستطيل",
"square": "مربع"
diff --git a/src/i18n/locales/cs/settings.json b/src/i18n/locales/cs/settings.json
index c1e11b787..a94f0b34d 100644
--- a/src/i18n/locales/cs/settings.json
+++ b/src/i18n/locales/cs/settings.json
@@ -274,8 +274,7 @@
"help": "Jak je webkamera složena s obrazovkou: obraz v obrazu, svislé skládání, dvojitý rám, tvar, zaoblení, velikost, poloha a zrcadlení.",
"mirrorWebcam": "Zrcadlit webkameru",
"webcamFraming": "Oříznutí kamery",
- "webcamFramingDrag": "Přetažením rámečku zvolte, co kamera ukáže.",
- "webcamFramingZoomFirst": "Přibližte obraz a přetažením rámečku zvolte, co kamera ukáže.",
+ "webcamFramingDrag": "Přetažením rámečku jej posunete, přetažením rohu přiblížíte.",
"shapes": {
"rectangle": "Obdélník",
"square": "Čtverec"
diff --git a/src/i18n/locales/de/settings.json b/src/i18n/locales/de/settings.json
index 4466a87dd..951ce251f 100644
--- a/src/i18n/locales/de/settings.json
+++ b/src/i18n/locales/de/settings.json
@@ -274,8 +274,7 @@
"help": "Wie die Webcam mit dem Bildschirm komponiert wird: Bild in Bild, vertikal gestapelt, Doppelrahmen, Form, Rundung, Größe, Position und Spiegelung.",
"mirrorWebcam": "Webcam spiegeln",
"webcamFraming": "Webcam-Ausschnitt",
- "webcamFramingDrag": "Ziehe den Rahmen, um den Bildausschnitt der Kamera zu wählen.",
- "webcamFramingZoomFirst": "Zoome hinein und ziehe dann den Rahmen, um den Bildausschnitt der Kamera zu wählen.",
+ "webcamFramingDrag": "Ziehe den Rahmen, um ihn zu verschieben, oder eine Ecke, um zu zoomen.",
"shapes": {
"rectangle": "Rechteck",
"square": "Quadrat"
diff --git a/src/i18n/locales/en/settings.json b/src/i18n/locales/en/settings.json
index 7f17b975c..0f37601b1 100644
--- a/src/i18n/locales/en/settings.json
+++ b/src/i18n/locales/en/settings.json
@@ -274,8 +274,7 @@
"help": "How the webcam is composed with the screen: picture-in-picture, vertical stack, dual frame, shape, roundness, size, position, and mirroring.",
"mirrorWebcam": "Mirror webcam",
"webcamFraming": "Webcam crop",
- "webcamFramingDrag": "Drag the frame to choose what the camera shows.",
- "webcamFramingZoomFirst": "Zoom in, then drag the frame to choose what the camera shows.",
+ "webcamFramingDrag": "Drag the frame to move it, or a corner to zoom.",
"shapes": {
"rectangle": "Rectangle",
"square": "Square"
diff --git a/src/i18n/locales/es/settings.json b/src/i18n/locales/es/settings.json
index e5bf1194d..84d78723c 100644
--- a/src/i18n/locales/es/settings.json
+++ b/src/i18n/locales/es/settings.json
@@ -274,8 +274,7 @@
"help": "Cómo se compone la webcam con la pantalla: imagen en imagen, pila vertical, marco doble, forma, redondez, tamaño, posición y efecto espejo.",
"mirrorWebcam": "Reflejar cámara",
"webcamFraming": "Encuadre de cámara",
- "webcamFramingDrag": "Arrastra el marco para elegir lo que muestra la cámara.",
- "webcamFramingZoomFirst": "Acerca el zoom y arrastra el marco para elegir lo que muestra la cámara.",
+ "webcamFramingDrag": "Arrastra el marco para moverlo, o una esquina para hacer zoom.",
"shapes": {
"rectangle": "Rectángulo",
"square": "Cuadrado"
diff --git a/src/i18n/locales/fr/settings.json b/src/i18n/locales/fr/settings.json
index 06a4ccbf7..81404d64c 100644
--- a/src/i18n/locales/fr/settings.json
+++ b/src/i18n/locales/fr/settings.json
@@ -274,8 +274,7 @@
"help": "Composition de la webcam avec l'écran : incrustation, empilement vertical, double cadre, forme, arrondi, taille, position et effet miroir.",
"mirrorWebcam": "Inverser la webcam",
"webcamFraming": "Cadrage de la webcam",
- "webcamFramingDrag": "Faites glisser le cadre pour choisir ce que montre la caméra.",
- "webcamFramingZoomFirst": "Zoomez, puis faites glisser le cadre pour choisir ce que montre la caméra.",
+ "webcamFramingDrag": "Faites glisser le cadre pour le déplacer, ou un coin pour zoomer.",
"shapes": {
"rectangle": "Rectangle",
"square": "Carré"
diff --git a/src/i18n/locales/it/settings.json b/src/i18n/locales/it/settings.json
index b0da6eef3..710894eaf 100644
--- a/src/i18n/locales/it/settings.json
+++ b/src/i18n/locales/it/settings.json
@@ -274,8 +274,7 @@
"help": "Come la webcam viene composta con lo schermo: picture-in-picture, pila verticale, doppio riquadro, forma, arrotondamento, dimensione, posizione e effetto specchio.",
"mirrorWebcam": "Specchia webcam",
"webcamFraming": "Inquadratura webcam",
- "webcamFramingDrag": "Trascina il riquadro per scegliere cosa mostra la fotocamera.",
- "webcamFramingZoomFirst": "Aumenta lo zoom, poi trascina il riquadro per scegliere cosa mostra la fotocamera.",
+ "webcamFramingDrag": "Trascina il riquadro per spostarlo, o un angolo per lo zoom.",
"shapes": {
"rectangle": "Rettangolo",
"square": "Quadrato"
diff --git a/src/i18n/locales/ja-JP/settings.json b/src/i18n/locales/ja-JP/settings.json
index 3c4bbdde3..b660d24a4 100644
--- a/src/i18n/locales/ja-JP/settings.json
+++ b/src/i18n/locales/ja-JP/settings.json
@@ -274,8 +274,7 @@
"help": "ウェブカメラと画面の合成方法: ピクチャインピクチャ、縦積み、デュアルフレーム、形状、丸み、サイズ、位置、左右反転。",
"mirrorWebcam": "Webカメラを反転",
"webcamFraming": "ウェブカメラの構図",
- "webcamFramingDrag": "枠をドラッグして、カメラに映す範囲を選びます。",
- "webcamFramingZoomFirst": "ズームしてから枠をドラッグし、カメラに映す範囲を選びます。",
+ "webcamFramingDrag": "枠をドラッグして移動、角をドラッグしてズームします。",
"shapes": {
"rectangle": "長方形",
"square": "正方形"
diff --git a/src/i18n/locales/ko-KR/settings.json b/src/i18n/locales/ko-KR/settings.json
index 8c9b1197e..3a562f5f0 100644
--- a/src/i18n/locales/ko-KR/settings.json
+++ b/src/i18n/locales/ko-KR/settings.json
@@ -274,8 +274,7 @@
"help": "웹캠과 화면을 합성하는 방식: PIP, 세로 배치, 이중 프레임, 모양, 모서리 둥글기, 크기, 위치, 좌우 반전.",
"mirrorWebcam": "웹캠 미러링",
"webcamFraming": "웹캠 구도",
- "webcamFramingDrag": "프레임을 드래그해 카메라에 보일 부분을 고르세요.",
- "webcamFramingZoomFirst": "확대한 다음 프레임을 드래그해 카메라에 보일 부분을 고르세요.",
+ "webcamFramingDrag": "프레임을 드래그해 옮기고, 모서리를 드래그해 확대/축소하세요.",
"shapes": {
"rectangle": "직사각형",
"square": "정사각형"
diff --git a/src/i18n/locales/pt-BR/settings.json b/src/i18n/locales/pt-BR/settings.json
index 2ace983d2..af8282968 100644
--- a/src/i18n/locales/pt-BR/settings.json
+++ b/src/i18n/locales/pt-BR/settings.json
@@ -274,8 +274,7 @@
"help": "Como a webcam é composta com a tela: picture-in-picture, pilha vertical, quadro duplo, formato, arredondamento, tamanho, posição e espelhamento.",
"mirrorWebcam": "Espelhar Webcam",
"webcamFraming": "Enquadramento da webcam",
- "webcamFramingDrag": "Arraste o quadro para escolher o que a câmera mostra.",
- "webcamFramingZoomFirst": "Aumente o zoom e arraste o quadro para escolher o que a câmera mostra.",
+ "webcamFramingDrag": "Arraste o quadro para movê-lo, ou um canto para dar zoom.",
"shapes": {
"rectangle": "Retângulo",
"square": "Quadrado"
diff --git a/src/i18n/locales/ru/settings.json b/src/i18n/locales/ru/settings.json
index 6145daf2f..4019ea8af 100644
--- a/src/i18n/locales/ru/settings.json
+++ b/src/i18n/locales/ru/settings.json
@@ -274,8 +274,7 @@
"help": "Как камера совмещается с экраном: «картинка в картинке», вертикальная стопка, двойной кадр, форма, скругление, размер, положение и зеркальное отражение.",
"mirrorWebcam": "Зеркалить веб-камеру",
"webcamFraming": "Кадрирование веб-камеры",
- "webcamFramingDrag": "Перетащите рамку, чтобы выбрать, что показывает камера.",
- "webcamFramingZoomFirst": "Увеличьте масштаб, затем перетащите рамку, чтобы выбрать, что показывает камера.",
+ "webcamFramingDrag": "Перетащите рамку, чтобы сдвинуть её, или угол, чтобы изменить масштаб.",
"shapes": {
"rectangle": "Прямоугольник",
"square": "Квадрат"
diff --git a/src/i18n/locales/tr/settings.json b/src/i18n/locales/tr/settings.json
index fda4e8f6d..9538b52b5 100644
--- a/src/i18n/locales/tr/settings.json
+++ b/src/i18n/locales/tr/settings.json
@@ -274,8 +274,7 @@
"help": "Web kamerasının ekranla birleştirilme biçimi: resim içinde resim, dikey yığın, çift çerçeve, şekil, yuvarlaklık, boyut, konum ve aynalama.",
"mirrorWebcam": "Web kamerasını aynala",
"webcamFraming": "Webcam kadrajı",
- "webcamFramingDrag": "Kameranın ne göstereceğini seçmek için çerçeveyi sürükleyin.",
- "webcamFramingZoomFirst": "Yakınlaştırın, ardından kameranın ne göstereceğini seçmek için çerçeveyi sürükleyin.",
+ "webcamFramingDrag": "Taşımak için çerçeveyi, yakınlaştırmak için bir köşesini sürükleyin.",
"shapes": {
"rectangle": "Dikdörtgen",
"square": "Kare"
diff --git a/src/i18n/locales/vi/settings.json b/src/i18n/locales/vi/settings.json
index ae5889346..d474188ea 100644
--- a/src/i18n/locales/vi/settings.json
+++ b/src/i18n/locales/vi/settings.json
@@ -274,8 +274,7 @@
"help": "Cách ghép webcam với màn hình: hình trong hình, xếp dọc, khung đôi, hình dạng, độ bo tròn, kích thước, vị trí và lật gương.",
"mirrorWebcam": "Lật webcam",
"webcamFraming": "Khung hình webcam",
- "webcamFramingDrag": "Kéo khung để chọn phần camera hiển thị.",
- "webcamFramingZoomFirst": "Phóng to, rồi kéo khung để chọn phần camera hiển thị.",
+ "webcamFramingDrag": "Kéo khung để di chuyển, hoặc kéo một góc để thu phóng.",
"shapes": {
"rectangle": "Chữ nhật",
"square": "Vuông"
diff --git a/src/i18n/locales/zh-CN/settings.json b/src/i18n/locales/zh-CN/settings.json
index 5d794b0b0..1aeadb210 100644
--- a/src/i18n/locales/zh-CN/settings.json
+++ b/src/i18n/locales/zh-CN/settings.json
@@ -274,8 +274,7 @@
"help": "摄像头与屏幕的合成方式:画中画、垂直堆叠、双画面、形状、圆角、大小、位置和镜像。",
"mirrorWebcam": "镜像摄像头",
"webcamFraming": "摄像头构图",
- "webcamFramingDrag": "拖动取景框,选择摄像头显示的范围。",
- "webcamFramingZoomFirst": "先放大,再拖动取景框,选择摄像头显示的范围。",
+ "webcamFramingDrag": "拖动取景框可移动,拖动一角可缩放。",
"shapes": {
"rectangle": "矩形",
"square": "正方形"
diff --git a/src/i18n/locales/zh-TW/settings.json b/src/i18n/locales/zh-TW/settings.json
index 1b48d1e87..a383ab5dc 100644
--- a/src/i18n/locales/zh-TW/settings.json
+++ b/src/i18n/locales/zh-TW/settings.json
@@ -274,8 +274,7 @@
"help": "攝影機與螢幕的合成方式:子母畫面、垂直堆疊、雙畫面、形狀、圓角、大小、位置與鏡像。",
"mirrorWebcam": "鏡像攝影機",
"webcamFraming": "攝影機構圖",
- "webcamFramingDrag": "拖曳取景框,選擇攝影機顯示的範圍。",
- "webcamFramingZoomFirst": "先放大,再拖曳取景框,選擇攝影機顯示的範圍。",
+ "webcamFramingDrag": "拖曳取景框可移動,拖曳一角可縮放。",
"shapes": {
"rectangle": "矩形",
"square": "正方形"