foss/excalidraw
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: use elements dimensions for scaling

Browse Source
This commit is contained in:
Arnošt Pleskot 2023-08-10 21:35:05 +02:00
parent bc5313b165
commit 8321e92368
No known key found for this signature in database
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/scene/export.ts
View File

@ -84,15 +84,19 @@ export const exportToCanvas = async (
}; };
if (appState.fancyBackgroundImageUrl) { if (appState.fancyBackgroundImageUrl) {
const contentBounds = getCommonBounds(elements);
const updatedRenderProps = await applyFancyBackground({ const updatedRenderProps = await applyFancyBackground({
canvas, canvas,
fancyBackgroundImageUrl: appState.fancyBackgroundImageUrl, fancyBackgroundImageUrl: appState.fancyBackgroundImageUrl,
backgroundColor: viewBackgroundColor, backgroundColor: viewBackgroundColor,
scale, scale,
renderConfig, renderConfig,
contentDimensions: {
w: contentBounds[2] - contentBounds[0],
h: contentBounds[3] - contentBounds[1],
},
}); });
console.log(scale, updatedRenderProps.scale);
renderConfig = updatedRenderProps.renderConfig; renderConfig = updatedRenderProps.renderConfig;
scale = updatedRenderProps.scale; scale = updatedRenderProps.scale;
} }

7
src/scene/fancyBackground.ts
View File

@ -137,6 +137,7 @@ const addContentBackground = (
const updateRenderConfig = ( const updateRenderConfig = (
renderConfig: RenderConfig, renderConfig: RenderConfig,
canvasDimensions: Dimensions, canvasDimensions: Dimensions,
contentDimesions: Dimensions,
): { scale: number; renderConfig: RenderConfig } => { ): { scale: number; renderConfig: RenderConfig } => {
const totalPadding = const totalPadding =
FANCY_BG_PADDING + FANCY_BG_BORDER_RADIUS + DEFAULT_EXPORT_PADDING; FANCY_BG_PADDING + FANCY_BG_BORDER_RADIUS + DEFAULT_EXPORT_PADDING;
@ -147,7 +148,7 @@ const updateRenderConfig = (
scrollX: renderConfig.scrollX + totalPadding, scrollX: renderConfig.scrollX + totalPadding,
scrollY: renderConfig.scrollY + totalPadding, scrollY: renderConfig.scrollY + totalPadding,
}, },
scale: getScaleToFit(canvasDimensions, { scale: getScaleToFit(contentDimesions, {
w: canvasDimensions.w - totalPadding * 2, w: canvasDimensions.w - totalPadding * 2,
h: canvasDimensions.h - totalPadding * 2, h: canvasDimensions.h - totalPadding * 2,
}), }),
@ -159,12 +160,14 @@ export const applyFancyBackground = async ({
fancyBackgroundImageUrl, fancyBackgroundImageUrl,
backgroundColor, backgroundColor,
renderConfig, renderConfig,
contentDimensions,
}: { }: {
canvas: HTMLCanvasElement; canvas: HTMLCanvasElement;
fancyBackgroundImageUrl: DataURL; fancyBackgroundImageUrl: DataURL;
backgroundColor: string; backgroundColor: string;
scale: number; scale: number;
renderConfig: RenderConfig; renderConfig: RenderConfig;
contentDimensions: Dimensions;
}) => { }) => {
const context = canvas.getContext("2d")!; const context = canvas.getContext("2d")!;
@ -183,5 +186,5 @@ export const applyFancyBackground = async ({
addContentBackground(context, canvasDimensions, backgroundColor); addContentBackground(context, canvasDimensions, backgroundColor);
return updateRenderConfig(renderConfig, canvasDimensions); return updateRenderConfig(renderConfig, canvasDimensions, contentDimensions);
}; };