sambruk/excalidraw
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
6 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils.ts
View File

@ -157,8 +157,9 @@ export function viewportCoordsToSceneCoords(
zoom: number;
},
canvas: HTMLCanvasElement | null,
scale: number,
) {
const zoomOrigin = getZoomOrigin(canvas);
const zoomOrigin = getZoomOrigin(canvas, scale);
const clientXWithZoom = zoomOrigin.x + (clientX - zoomOrigin.x) / zoom;
const clientYWithZoom = zoomOrigin.y + (clientY - zoomOrigin.y) / zoom;
@ -180,8 +181,9 @@ export function sceneCoordsToViewportCoords(
zoom: number;
},
canvas: HTMLCanvasElement | null,
scale: number,
) {
const zoomOrigin = getZoomOrigin(canvas);
const zoomOrigin = getZoomOrigin(canvas, scale);
const sceneXWithZoomAndScroll =
zoomOrigin.x - (zoomOrigin.x - sceneX - scrollX) * zoom;
const sceneYWithZoomAndScroll =