Create polished demo videos without editing skills. Mac/Windows/Linux
Merge origin/main into feat/export-caption-sidecars
webadderallca6385eac643
diff --cc electron/electron-env.d.tsindex 6dc7d396,fdc19ccb..2aa748b4--- a/electron/electron-env.d.ts+++ b/electron/electron-env.d.ts@@@ -743,6 -752,6 +752,7 @@@ interface WindowprojectData: unknown,projectName: string,thumbnailDataUrl?: string | null,++ mode?: "rename" | "copy",) => Promise<{success: boolean;path?: string;diff --cc electron/preload.tsindex 6f941e80,c339ad3c..9a15edb9--- a/electron/preload.ts+++ b/electron/preload.ts@@@ -783,12 -783,12 +783,14 @@@ contextBridge.exposeInMainWorld("electrprojectData: unknown,projectName: string,thumbnailDataUrl?: string | null,++ mode?: "rename" | "copy",) => {return ipcRenderer.invoke("save-project-file-named",projectData,projectName,thumbnailDataUrl,++ mode,);},loadProjectFile: () => {diff --cc src/components/video-editor/SettingsPanel.tsxindex 0c2ffe8a,fce5f2b9..fbf390b4--- a/src/components/video-editor/SettingsPanel.tsx+++ b/src/components/video-editor/SettingsPanel.tsx@@@ -3918,20 -3903,7 +3918,20 @@@ export function SettingsPanel(previewCurrentTime={webcamPreviewCurrentTime}previewPlaying={webcamPreviewPlaying}previewTimeOffsetMs={webcam?.timeOffsetMs}- onCropChange={(cropRegion) => updateWebcam({ cropRegion })}+ onCropChange={(cropRegion, previewFrame) =>+ updateWebcam({+ cropRegion,+ height: previewFrame+ ? getCropMatchedWebcamHeightPercent(+ webcamWidth,- webcamWidth,++ webcamHeight,+ previewFrame.width,+ previewFrame.height,+ cropRegion,+ )+ : webcamHeight,+ })+ }/></div><div className="rounded-lg bg-foreground/[0.03] px-2.5 py-2">diff --cc src/lib/exporter/modernFrameRenderer.tsindex ddb52a7d,028dcbad..529b2109--- a/src/lib/exporter/modernFrameRenderer.ts+++ b/src/lib/exporter/modernFrameRenderer.ts@@@ -2916,19 -2911,10 +2916,27 @@@ export class FrameRenderer}const margin = webcam.margin ?? 24;- const size = getWebcamOverlaySizePx({+ const widthPercent = webcam.width ?? webcam.size ?? 50;++ const aspectSourceWidth =++ liveSourceDimensions.width > 0++ ? liveSourceDimensions.width++ : renderableWebcamSource.width;++ const aspectSourceHeight =++ liveSourceDimensions.height > 0++ ? liveSourceDimensions.height++ : renderableWebcamSource.height;+ const heightPercent = getCropMatchedWebcamHeightPercent(+ widthPercent,+ webcam.height ?? webcam.size ?? 50,- renderableWebcamSource.width,- renderableWebcamSource.height,++ aspectSourceWidth,++ aspectSourceHeight,+ webcam.cropRegion,+ );+ const dimensions = getWebcamOverlayDimensionsPx({containerWidth: this.config.width,containerHeight: this.config.height,- sizePercent: webcam.size ?? 50,+ widthPercent,+ heightPercent,margin,zoomScale: this.animationState.appliedScale || 1,reactToZoom: webcam.reactToZoom ?? true,