smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove last get/setTransform (#964)

Browse source 
My original hack to put the scale when we create the canvas element doesn't make much sense. It should be done when we are rendering the scene. I moved it there in this PR.

The rest was all about forwarding the scale to where it's needed.
This commit is contained in:
Christopher Chedeau 2020-03-15 12:25:18 -07:00 • committed by GitHub
parent 79ea76b48b
commit 2937efacde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/renderer/renderElement.ts
View file

@ -64,6 +64,10 @@ function generateElementCanvas(
const rc = rough.canvas(canvas);
drawElementOnCanvas(element, rc, context);
context.translate(-CANVAS_PADDING, -CANVAS_PADDING);
context.scale(
1 / (window.devicePixelRatio * zoom),
1 / (window.devicePixelRatio * zoom),
);
return { element, canvas, canvasZoom: zoom, canvasOffsetX, canvasOffsetY };
}

9
src/renderer/renderScene.ts
View file

@ -55,6 +55,7 @@ export function renderScene(
const elements = allElements.filter(element => !element.isDeleted);
const context = canvas.getContext("2d")!;
context.scale(scale, scale);
// When doing calculations based on canvas width we should used normalized one
const normalizedCanvasWidth = canvas.width / scale;
@ -205,8 +206,9 @@ export function renderScene(
}
// Paint scrollbars
let scrollBars;
if (renderScrollbars) {
const scrollBars = getScrollBars(
scrollBars = getScrollBars(
elements,
normalizedCanvasWidth,
normalizedCanvasHeight,
@ -231,10 +233,11 @@ export function renderScene(
});
context.fillStyle = fillStyle;
context.strokeStyle = strokeStyle;
return { atLeastOneVisibleElement: visibleElements.length > 0, scrollBars };
}
return { atLeastOneVisibleElement: visibleElements.length > 0 };
context.scale(1 / scale, 1 / scale);
return { atLeastOneVisibleElement: visibleElements.length > 0, scrollBars };
}
function isVisibleElement(