clean up viewport info update

Author: timon-schelling

editor/src/messages/input_mapper/utility_types/input_mouse.rs

@@ -3,41 +3,13 @@ use crate::messages::prelude::*;
 use bitflags::bitflags;
 use glam::DVec2;
 use std::collections::VecDeque;
+use std::hash::{Hash, Hasher};
 
 // Origin is top left
 pub type DocumentPosition = DVec2;
 pub type ViewportPosition = DVec2;
 pub type EditorPosition = DVec2;
 
-#[derive(PartialEq, Clone, Debug, Default, serde::Serialize, serde::Deserialize)]
-pub struct ViewportBounds {
-	pub top_left: DVec2,
-	pub bottom_right: DVec2,
-}
-
-impl ViewportBounds {
-	pub fn from_slice(slice: &[f64]) -> Self {
-		Self {
-			top_left: DVec2::from_slice(&slice[0..2]),
-			bottom_right: DVec2::from_slice(&slice[2..4]),
-		}
-	}
-
-	pub fn size(&self) -> DVec2 {
-		(self.bottom_right - self.top_left).ceil()
-	}
-
-	pub fn center(&self) -> DVec2 {
-		(self.bottom_right - self.top_left).ceil() / 2.
-	}
-
-	pub fn in_bounds(&self, position: ViewportPosition) -> bool {
-		position.x >= 0. && position.y >= 0. && position.x <= self.bottom_right.x && position.y <= self.bottom_right.y
-	}
-}
-
-use std::hash::{Hash, Hasher};
-
 #[derive(Debug, Copy, Clone, Default, serde::Serialize, serde::Deserialize)]
 pub struct ScrollDelta {
 	pub x: f64,

editor/src/messages/viewport/viewport_message.rs

@@ -3,7 +3,6 @@ use crate::messages::prelude::*;
 #[impl_message(Message, Viewport)]
 #[derive(PartialEq, Clone, Debug, serde::Serialize, serde::Deserialize)]
 pub enum ViewportMessage {
-	UpdateScale { scale: f64 },
-	UpdateBounds { x: f64, y: f64, width: f64, height: f64 },
+	Update { x: f64, y: f64, width: f64, height: f64, scale: f64 },
 	Trigger,
 }

editor/src/messages/viewport/viewport_message_handler.rs

@@ -25,16 +25,23 @@ impl Default for ViewportMessageHandler {
 impl MessageHandler<ViewportMessage, ()> for ViewportMessageHandler {
 	fn process_message(&mut self, message: ViewportMessage, responses: &mut VecDeque<Message>, _: ()) {
 		match message {
-			ViewportMessage::UpdateScale { scale } => {
+			ViewportMessage::Update { x, y, width, height, scale } => {
 				assert_ne!(scale, 0.0, "Viewport scale cannot be zero");
 				self.scale = scale;
-			}
-			ViewportMessage::UpdateBounds { x, y, width, height } => {
+
 				self.bounds = LogicalBounds { x, y, width, height };
 			}
 			ViewportMessage::Trigger => {}
 		}
 
+		let physical_bounds = self.physical_bounds();
+		responses.add(FrontendMessage::UpdateViewportPhysicalBounds {
+			x: physical_bounds.x,
+			y: physical_bounds.y,
+			width: physical_bounds.width,
+			height: physical_bounds.height,
+		});
+
 		responses.add(NavigationMessage::CanvasPan { delta: DVec2::ZERO });
 		responses.add(NodeGraphMessage::SetGridAlignedEdges);
 
@@ -46,14 +53,6 @@ impl MessageHandler<ViewportMessage, ()> for ViewportMessageHandler {
 				.into(),
 			],
 		});
-
-		let physical_bounds = self.physical_bounds();
-		responses.add(FrontendMessage::UpdateViewportPhysicalBounds {
-			x: physical_bounds.x,
-			y: physical_bounds.y,
-			width: physical_bounds.width,
-			height: physical_bounds.height,
-		});
 	}
 
 	advertise_actions!(ViewportMessageDiscriminant;);

frontend/src/components/panels/Document.svelte

@@ -20,7 +20,7 @@
 	import type { DocumentState } from "@graphite/state-providers/document";
 	import { textInputCleanup } from "@graphite/utility-functions/keyboard-entry";
 	import { extractPixelData, rasterizeSVGCanvas } from "@graphite/utility-functions/rasterization";
-	import { updateBoundsOfViewports } from "@graphite/utility-functions/viewports";
+	import { updateBoundsOfViewports as updateViewport } from "@graphite/utility-functions/viewports";
 
 	import EyedropperPreview, { ZOOM_WINDOW_DIMENSIONS } from "@graphite/components/floating-menus/EyedropperPreview.svelte";
 	import LayoutCol from "@graphite/components/layout/LayoutCol.svelte";
@@ -392,10 +392,7 @@
 		rulerVertical?.resize();
 
 		// Send the new bounds of the viewports to the backend
-		if (viewport.parentElement) updateBoundsOfViewports(editor);
-
-		devicePixelRatio = window.devicePixelRatio;
-		editor.handle.updateViewportScale(devicePixelRatio);
+		if (viewport.parentElement) updateViewport(editor);
 	}
 
 	onMount(() => {

frontend/src/utility-functions/viewports.ts

@@ -2,13 +2,17 @@ import { type Editor } from "@graphite/editor";
 
 export function updateBoundsOfViewports(editor: Editor) {
 	const viewports = Array.from(window.document.querySelectorAll("[data-viewport-container]"));
-	const boundsOfViewports = viewports.map((canvas) => {
-		const bounds = canvas.getBoundingClientRect();
-		return [bounds.left, bounds.top, bounds.right, bounds.bottom];
-	});
 
-	const flattened = boundsOfViewports.flat();
-	const data = Float64Array.from(flattened);
+	if (viewports.length <= 0) return;
 
-	if (boundsOfViewports.length > 0) editor.handle.boundsOfViewport(data);
+	const viewportBounds = viewports[0].getBoundingClientRect();
+
+	const left = viewportBounds.left;
+	const top = viewportBounds.top;
+	const right = viewportBounds.right;
+	const bottom = viewportBounds.bottom;
+
+	const scale = window.devicePixelRatio || 1;
+
+	editor.handle.updateViewport(left, top, right, bottom, scale);
 }

frontend/wasm/src/editor_api.rs

@@ -516,16 +516,15 @@ impl EditorHandle {
 		self.dispatch(message);
 	}
 
-	/// Send new bounds when viewport get resized or moved within the editor
-	/// [left, top, right, bottom]
-	#[wasm_bindgen(js_name = boundsOfViewport)]
-	pub fn bounds_of_viewport(&self, bounds: &[f64]) {
-		let x = bounds[0];
-		let y = bounds[1];
-		let width = bounds[2] - bounds[0];
-		let height = bounds[3] - bounds[1];
-
-		let message = ViewportMessage::UpdateBounds { x, y, width, height };
+	/// Send new viewport info to the backend
+	#[wasm_bindgen(js_name = updateViewport)]
+	pub fn update_viewport(&self, left: f64, top: f64, right: f64, bottom: f64, scale: f64) {
+		let x = left;
+		let y = top;
+		let width = right - left;
+		let height = bottom - top;
+
+		let message = ViewportMessage::Update { x, y, width, height, scale };
 		self.dispatch(message);
 	}
 
@@ -536,13 +535,6 @@ impl EditorHandle {
 		self.dispatch(message);
 	}
 
-	/// Inform the overlays system of the current device pixel ratio
-	#[wasm_bindgen(js_name = updateViewportScale)]
-	pub fn update_viewport_scale(&self, scale: f64) {
-		let message = ViewportMessage::UpdateScale { scale };
-		self.dispatch(message);
-	}
-
 	/// Mouse movement within the screenspace bounds of the viewport
 	#[wasm_bindgen(js_name = onMouseMove)]
 	pub fn on_mouse_move(&self, x: f64, y: f64, mouse_keys: u8, modifiers: u8) {