diff --git a/editor/src/messages/frontend/frontend_message.rs b/editor/src/messages/frontend/frontend_message.rs index 01f45f88..ea04e0ae 100644 --- a/editor/src/messages/frontend/frontend_message.rs +++ b/editor/src/messages/frontend/frontend_message.rs @@ -179,9 +179,6 @@ pub enum FrontendMessage { size: (f64, f64), multiplier: (f64, f64), }, - UpdateDocumentTransform { - transform: String, - }, UpdateEyedropperSamplingState { #[serde(rename = "mousePosition")] mouse_position: Option<(f64, f64)>, diff --git a/editor/src/messages/portfolio/document/document_message_handler.rs b/editor/src/messages/portfolio/document/document_message_handler.rs index 08e145d9..27df3f0b 100644 --- a/editor/src/messages/portfolio/document/document_message_handler.rs +++ b/editor/src/messages/portfolio/document/document_message_handler.rs @@ -880,7 +880,6 @@ impl MessageHandler { self.document_legacy.metadata.document_to_viewport = transform; let transform = graphene_core::renderer::format_transform_matrix(transform); - responses.add(FrontendMessage::UpdateDocumentTransform { transform }); responses.add(DocumentMessage::RenderRulers); responses.add(DocumentMessage::RenderScrollbars); responses.add(NodeGraphMessage::RunDocumentGraph); diff --git a/frontend/src/components/panels/Document.svelte b/frontend/src/components/panels/Document.svelte index 6961bbc9..5b961909 100644 --- a/frontend/src/components/panels/Document.svelte +++ b/frontend/src/components/panels/Document.svelte @@ -19,8 +19,6 @@ UpdateEyedropperSamplingState, UpdateMouseCursor, UpdateDocumentNodeRender, - UpdateDocumentTransform, - TriggerGraphViewOverlay, } from "@graphite/wasm-communication/messages"; import EyedropperPreview, { ZOOM_WINDOW_DIMENSIONS } from "@graphite/components/floating-menus/EyedropperPreview.svelte"; @@ -157,11 +155,6 @@ rasterizedCanvas = undefined; } - export function updateDocumentTransform(transform: string) { - artworkTransform = transform; - rasterizedCanvas = undefined; - } - export async function updateEyedropperSamplingState(mousePosition: XY | undefined, colorPrimary: string, colorSecondary: string): Promise<[number, number, number] | undefined> { if (mousePosition === undefined) { cursorEyedropper = false; @@ -180,11 +173,10 @@ const outsideArtboardsColor = getComputedStyle(window.document.documentElement).getPropertyValue("--color-2-mildblack"); const outsideArtboards = ``; - const artboards = artboardSvg; - const artwork = `${nodeRenderSvg}`; + const svg = ` - ${outsideArtboards}${artboards}${artwork} - `.trim(); + ${outsideArtboards}${artboardSvg}${nodeRenderSvg} + `.trim(); if (!rasterizedCanvas) { rasterizedCanvas = await rasterizeSVGCanvas(svg, width * dpiFactor, height * dpiFactor, "image/png"); diff --git a/frontend/src/state-providers/document.ts b/frontend/src/state-providers/document.ts index d672a2e4..4d6607ff 100644 --- a/frontend/src/state-providers/document.ts +++ b/frontend/src/state-providers/document.ts @@ -13,7 +13,6 @@ import { UpdateWorkingColorsLayout, UpdateGraphViewOverlayButtonLayout, UpdateNodeGraphBarLayout, - UpdateDocumentTransform, TriggerGraphViewOverlay, } from "@graphite/wasm-communication/messages"; @@ -30,8 +29,6 @@ export function createDocumentState(editor: Editor) { nodeGraphBarLayout: defaultWidgetLayout(), // Graph view overlay graphViewOverlayOpen: false, - // CSS transform property to be applied to artwork - artworkTransform: "", }); const { subscribe, update } = state; @@ -106,14 +103,6 @@ export function createDocumentState(editor: Editor) { // Request a resize event so the viewport gets measured now that the canvas is populated and positioned correctly window.dispatchEvent(new CustomEvent("resize")); }); - editor.subscriptions.subscribeJsMessage(UpdateDocumentTransform, async (data) => { - await tick(); - - update((state) => { - state.artworkTransform = data.transform; - return state; - }); - }); // Show or hide the graph view overlay editor.subscriptions.subscribeJsMessage(TriggerGraphViewOverlay, (triggerGraphViewOverlay) => { update((state) => { diff --git a/frontend/src/wasm-communication/messages.ts b/frontend/src/wasm-communication/messages.ts index 334ccbde..c962e1d2 100644 --- a/frontend/src/wasm-communication/messages.ts +++ b/frontend/src/wasm-communication/messages.ts @@ -452,10 +452,6 @@ export class UpdateDocumentNodeRender extends JsMessage { readonly svg!: string; } -export class UpdateDocumentTransform extends JsMessage { - readonly transform!: string; -} - export class UpdateDocumentScrollbars extends JsMessage { @TupleToVec2 readonly position!: XY; @@ -1428,7 +1424,6 @@ export const messageMakers: Record = { UpdateDocumentOverlays, UpdateDocumentRulers, UpdateDocumentScrollbars, - UpdateDocumentTransform, UpdateEyedropperSamplingState, UpdateGraphViewOverlayButtonLayout, UpdateImageData,