Make scrollbars interactable (#328)

* Make scrollbars interactable

* Add watcher for position change

* Fix case of data

* Fix updateHandlePosition capitalization

* Clean up class name thing

* Scroll bars between 0 and 1

* Allow width to be 100%

* Scrollbars reflect backend

* Include viewport in scrollbar

* Add half viewport padding for scrollbars

* Refactor scrollbar using lerp

* Send messages to backend

* Refactor

* Use glam::DVec2

* Remove glam::

* Remove unnecessary abs

* Add TrueDoctor's change

* Add missing minus

* Fix vue issues

* Fix viewport size

* Remove unnecessary log

* Linear dragging

editor/src/communication/dispatcher.rs

@@ -27,6 +27,7 @@ impl Dispatcher {
 				| Message::InputMapper(_)
 				| Message::Documents(DocumentsMessage::Document(DocumentMessage::RenderDocument))
 				| Message::Frontend(FrontendMessage::UpdateCanvas { .. })
+				| Message::Frontend(FrontendMessage::UpdateScrollbars { .. })
 				| Message::Frontend(FrontendMessage::SetCanvasZoom { .. })
 				| Message::Frontend(FrontendMessage::SetCanvasRotation { .. })
 				| Message::Documents(DocumentsMessage::Document(DocumentMessage::DispatchOperation { .. }))

editor/src/document/document_file.rs

@@ -109,12 +109,6 @@ impl From<DocumentOperation> for Message {
 }
 
 impl DocumentMessageHandler {
-	pub fn active_document(&self) -> &DocumentMessageHandler {
-		self
-	}
-	pub fn active_document_mut(&mut self) -> &mut DocumentMessageHandler {
-		self
-	}
 	fn filter_document_responses(&self, document_responses: &mut Vec<DocumentResponse>) -> bool {
 		let len = document_responses.len();
 		document_responses.retain(|response| !matches!(response, DocumentResponse::DocumentChanged));
@@ -320,9 +314,7 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
 				)
 			}
 			SetBlendModeForSelectedLayers(blend_mode) => {
-				let active_document = self;
+				for path in self.layer_data.iter().filter_map(|(path, data)| data.selected.then(|| path.clone())) {
-
-				for path in active_document.layer_data.iter().filter_map(|(path, data)| data.selected.then(|| path.clone())) {
 					responses.push_back(DocumentOperation::SetLayerBlendMode { path, blend_mode }.into());
 				}
 			}
@@ -407,12 +399,32 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
 				Err(e) => log::error!("DocumentError: {:?}", e),
 				Ok(_) => (),
 			},
-			RenderDocument => responses.push_back(
+			RenderDocument => {
-				FrontendMessage::UpdateCanvas {
+				responses.push_back(
-					document: self.document.render_root(),
+					FrontendMessage::UpdateCanvas {
-				}
+						document: self.document.render_root(),
-				.into(),
+					}
-			),
+					.into(),
+				);
+				let root = self.layerdata(&[]);
+				let viewport = ipp.viewport_bounds.size();
+				let [bounds1, bounds2] = self.document.visible_layers_bounding_box().unwrap_or_default();
+				let bounds1 = bounds1.min(DVec2::ZERO) - viewport * (f64::powf(2., root.scale / 3.) * 0.5);
+				let bounds2 = bounds2.max(viewport) + viewport * (f64::powf(2., root.scale / 3.) * 0.5);
+				let bounds_length = bounds2 - bounds1;
+				let scrollbar_multiplier = bounds_length - viewport;
+				let scrollbar_position = bounds1.abs() / scrollbar_multiplier;
+				let scrollbar_size = viewport / bounds_length;
+				responses.push_back(
+					FrontendMessage::UpdateScrollbars {
+						position: scrollbar_position.into(),
+						size: scrollbar_size.into(),
+						multiplier: scrollbar_multiplier.into(),
+					}
+					.into(),
+				);
+			}
+
 			NudgeSelectedLayers(x, y) => {
 				for path in self.selected_layers().cloned() {
 					let operation = DocumentOperation::TransformLayerInViewport {

editor/src/document/movement_handler.rs

@@ -30,6 +30,7 @@ pub enum MovementMessage {
 	DecreaseCanvasZoom,
 	WheelCanvasZoom,
 	ZoomCanvasToFitAll,
+	TranslateCanvas(glam::DVec2),
 }
 
 #[derive(Debug, Clone, Default, PartialEq)]
@@ -189,6 +190,12 @@ impl MessageHandler<MovementMessage, (&mut LayerData, &Document, &InputPreproces
 					self.create_document_transform_from_layerdata(layerdata, &ipp.viewport_bounds, responses);
 				}
 			}
+			TranslateCanvas(delta) => {
+				let transformed_delta = document.root.transform.inverse().transform_vector2(delta);
+
+				layerdata.translation += transformed_delta;
+				self.create_document_transform_from_layerdata(layerdata, &ipp.viewport_bounds, responses);
+			}
 		}
 	}
 	fn actions(&self) -> ActionList {

editor/src/frontend/frontend_message_handler.rs

@@ -17,6 +17,7 @@ pub enum FrontendMessage {
 	DisplayConfirmationToCloseDocument { document_index: usize },
 	DisplayConfirmationToCloseAllDocuments,
 	UpdateCanvas { document: String },
+	UpdateScrollbars { position: (f64, f64), size: (f64, f64), multiplier: (f64, f64) },
 	UpdateLayer { path: Vec<LayerId>, data: LayerPanelEntry },
 	ExportDocument { document: String, name: String },
 	SaveDocument { document: String, name: String },
@@ -50,6 +51,7 @@ impl MessageHandler<FrontendMessage, ()> for FrontendMessageHandler {
 		ExpandFolder,
 		SetActiveTool,
 		UpdateCanvas,
+		UpdateScrollbars,
 		EnableTextInput,
 		DisableTextInput,
 		SetCanvasZoom,

frontend/src/components/panels/Document.vue

@@ -123,11 +123,23 @@
 						</div>
 					</LayoutCol>
 					<LayoutCol :class="'bar-area'">
-						<PersistentScrollbar :direction="ScrollbarDirection.Vertical" :class="'right-scrollbar'" />
+						<PersistentScrollbar
+							:direction="ScrollbarDirection.Vertical"
+							:handlePosition="scrollbarPos.y"
+							@update:handlePosition="translateCanvasY"
+							v-model:handleLength="scrollbarSize.y"
+							:class="'right-scrollbar'"
+						/>
 					</LayoutCol>
 				</LayoutRow>
 				<LayoutRow :class="'bar-area'">
-					<PersistentScrollbar :direction="ScrollbarDirection.Horizontal" :class="'bottom-scrollbar'" />
+					<PersistentScrollbar
+						:direction="ScrollbarDirection.Horizontal"
+						:handlePosition="scrollbarPos.x"
+						@update:handlePosition="translateCanvasX"
+						v-model:handleLength="scrollbarSize.x"
+						:class="'bottom-scrollbar'"
+					/>
 				</LayoutRow>
 			</LayoutCol>
 		</LayoutRow>
@@ -210,7 +222,7 @@
 <script lang="ts">
 import { defineComponent } from "vue";
 
-import { ResponseType, registerResponseHandler, Response, UpdateCanvas, SetActiveTool, SetCanvasZoom, SetCanvasRotation } from "@/utilities/response-handler";
+import { ResponseType, registerResponseHandler, Response, UpdateCanvas, UpdateScrollbars, SetActiveTool, SetCanvasZoom, SetCanvasRotation } from "@/utilities/response-handler";
 import { SeparatorDirection, SeparatorType } from "@/components/widgets/widgets";
 import { comingSoon } from "@/utilities/errors";
 
@@ -271,6 +283,16 @@ export default defineComponent({
 		async setRotation(newRotation: number) {
 			(await wasm).set_rotation(newRotation * (Math.PI / 180));
 		},
+		async translateCanvasX(newValue: number) {
+			const delta = newValue - this.scrollbarPos.x;
+			this.scrollbarPos.x = newValue;
+			(await wasm).translate_canvas(-delta * this.scrollbarMultiplier.x, 0);
+		},
+		async translateCanvasY(newValue: number) {
+			const delta = newValue - this.scrollbarPos.y;
+			this.scrollbarPos.y = newValue;
+			(await wasm).translate_canvas(0, -delta * this.scrollbarMultiplier.y);
+		},
 		async selectTool(toolName: string) {
 			(await wasm).select_tool(toolName);
 		},
@@ -287,6 +309,15 @@ export default defineComponent({
 			if (updateData) this.viewportSvg = updateData.document;
 		});
 
+		registerResponseHandler(ResponseType.UpdateScrollbars, (responseData: Response) => {
+			const updateData = responseData as UpdateScrollbars;
+			if (updateData) {
+				this.scrollbarPos = updateData.position;
+				this.scrollbarSize = updateData.size;
+				this.scrollbarMultiplier = updateData.multiplier;
+			}
+		});
+
 		registerResponseHandler(ResponseType.SetActiveTool, (responseData: Response) => {
 			const toolData = responseData as SetActiveTool;
 			if (toolData) this.activeTool = toolData.tool_name;
@@ -325,6 +356,9 @@ export default defineComponent({
 			overlaysEnabled: true,
 			documentRotation: 0,
 			documentZoom: 100,
+			scrollbarPos: { x: 0.5, y: 0.5 },
+			scrollbarSize: { x: 0.5, y: 0.5 },
+			scrollbarMultiplier: { x: 0, y: 0 },
 			IncrementBehavior,
 			IncrementDirection,
 			MenuDirection,

frontend/src/components/widgets/scrollbars/PersistentScrollbar.vue

@@ -1,12 +1,10 @@
 <template>
 	<div class="persistent-scrollbar" :class="direction.toLowerCase()">
-		<button class="arrow decrease"></button>
+		<button class="arrow decrease" @mousedown="changePosition(-50)"></button>
-		<div class="scroll-track">
+		<div class="scroll-track" ref="scrollTrack" @mousedown="grabArea">
-			<div class="scroll-click-area decrease" :style="[trackStart, preThumb, sides]"></div>
+			<div class="scroll-thumb" @mousedown="grabHandle" :class="{ dragging }" ref="handle" :style="[thumbStart, thumbEnd, sides]"></div>
-			<div class="scroll-thumb" :style="[thumbStart, thumbEnd, sides]"></div>
-			<div class="scroll-click-area increase" :style="[postThumb, trackEnd, sides]"></div>
 		</div>
-		<button class="arrow increase"></button>
+		<button class="arrow increase" @click="changePosition(50)"></button>
 	</div>
 </template>
 
@@ -39,6 +37,9 @@
 			&:hover {
 				background: var(--color-6-lowergray);
 			}
+			&.dragging {
+				background: var(--color-accent-hover);
+			}
 		}
 
 		.scroll-click-area {
@@ -57,6 +58,9 @@
 			&:hover {
 				border-color: transparent transparent var(--color-6-lowergray) transparent;
 			}
+			&:active {
+				border-color: transparent transparent var(--color-c-brightgray) transparent;
+			}
 		}
 
 		.arrow.increase {
@@ -67,6 +71,9 @@
 			&:hover {
 				border-color: var(--color-6-lowergray) transparent transparent transparent;
 			}
+			&:active {
+				border-color: var(--color-c-brightgray) transparent transparent transparent;
+			}
 		}
 	}
 
@@ -81,6 +88,9 @@
 			&:hover {
 				border-color: transparent var(--color-6-lowergray) transparent transparent;
 			}
+			&:active {
+				border-color: transparent var(--color-c-brightgray) transparent transparent;
+			}
 		}
 
 		.arrow.increase {
@@ -91,6 +101,9 @@
 			&:hover {
 				border-color: transparent transparent transparent var(--color-6-lowergray);
 			}
+			&:active {
+				border-color: transparent transparent transparent var(--color-c-brightgray);
+			}
 		}
 	}
 }
@@ -99,6 +112,15 @@
 <script lang="ts">
 import { defineComponent, PropType } from "vue";
 
+// Linear Interpolation
+const lerp = (x: number, y: number, a: number) => x * (1 - a) + y * a;
+
+// Convert the position of the handle (0-1) to the position on the track (0-1).
+// This includes the 1/2 handle length gap  of the possible handle positionson each side so the end of the handle doesn't go off the track.
+const handleToTrack = (handleLen: number, handlePos: number) => lerp(handleLen / 2, 1 - handleLen / 2, handlePos);
+
+const mousePosition = (direction: ScrollbarDirection, e: MouseEvent) => (direction === ScrollbarDirection.Vertical ? e.clientY : e.clientX);
+
 export enum ScrollbarDirection {
 	"Horizontal" = "Horizontal",
 	"Vertical" = "Vertical",
@@ -107,33 +129,19 @@ export enum ScrollbarDirection {
 export default defineComponent({
 	props: {
 		direction: { type: String as PropType<ScrollbarDirection>, default: ScrollbarDirection.Vertical },
+		handlePosition: { type: Number, default: 0.5 },
+		handleLength: { type: Number, default: 0.5 },
 	},
 	computed: {
-		trackStart(): { left: string } | { top: string } {
-			return this.direction === ScrollbarDirection.Vertical ? { top: "0%" } : { left: "0%" };
-		},
-		preThumb(): { right: string } | { bottom: string } {
-			const start = 25;
-
-			return this.direction === ScrollbarDirection.Vertical ? { bottom: `${100 - start}%` } : { right: `${100 - start}%` };
-		},
 		thumbStart(): { left: string } | { top: string } {
-			const start = 25;
+			const start = handleToTrack(this.handleLength, this.handlePosition) - this.handleLength / 2;
 
-			return this.direction === ScrollbarDirection.Vertical ? { top: `${start}%` } : { left: `${start}%` };
+			return this.direction === ScrollbarDirection.Vertical ? { top: `${start * 100}%` } : { left: `${start * 100}%` };
 		},
 		thumbEnd(): { right: string } | { bottom: string } {
-			const end = 25;
+			const end = 1 - handleToTrack(this.handleLength, this.handlePosition) - this.handleLength / 2;
 
-			return this.direction === ScrollbarDirection.Vertical ? { bottom: `${end}%` } : { right: `${end}%` };
+			return this.direction === ScrollbarDirection.Vertical ? { bottom: `${end * 100}%` } : { right: `${end * 100}%` };
-		},
-		postThumb(): { left: string } | { top: string } {
-			const end = 25;
-
-			return this.direction === ScrollbarDirection.Vertical ? { top: `${100 - end}%` } : { left: `${100 - end}%` };
-		},
-		trackEnd(): { right: string } | { bottom: string } {
-			return this.direction === ScrollbarDirection.Vertical ? { bottom: "0%" } : { right: "0%" };
 		},
 		sides(): { left: string; right: string } | { top: string; bottom: string } {
 			return this.direction === ScrollbarDirection.Vertical ? { left: "0%", right: "0%" } : { top: "0%", bottom: "0%" };
@@ -142,7 +150,58 @@ export default defineComponent({
 	data() {
 		return {
 			ScrollbarDirection,
+			dragging: false,
+			mousePos: 0,
 		};
 	},
+	mounted() {
+		window.addEventListener("mouseup", () => {
+			this.dragging = false;
+		});
+		window.addEventListener("mousemove", this.mouseMove);
+	},
+	methods: {
+		trackLength(): number {
+			const track = this.$refs.scrollTrack as HTMLElement;
+			return this.direction === ScrollbarDirection.Vertical ? track.clientHeight - this.handleLength : track.clientWidth;
+		},
+		trackOffset(): number {
+			const track = this.$refs.scrollTrack as HTMLElement;
+			return this.direction === ScrollbarDirection.Vertical ? track.getBoundingClientRect().top : track.getBoundingClientRect().left;
+		},
+		clampHandlePosition(newPos: number) {
+			const clampedPosition = Math.min(Math.max(newPos, 0), 1);
+			this.$emit("update:handlePosition", clampedPosition);
+		},
+		updateHandlePosition(e: MouseEvent) {
+			const position = mousePosition(this.direction, e);
+			this.clampHandlePosition(this.handlePosition + (position - this.mousePos) / (this.trackLength() * (1 - this.handleLength)));
+			this.mousePos = position;
+		},
+		grabHandle(e: MouseEvent) {
+			if (!this.dragging) {
+				this.dragging = true;
+				this.mousePos = mousePosition(this.direction, e);
+			}
+		},
+		grabArea(e: MouseEvent) {
+			if (!this.dragging) {
+				this.dragging = true;
+				this.mousePos = mousePosition(this.direction, e);
+				this.clampHandlePosition(((this.mousePos - this.trackOffset()) / this.trackLength() - this.handleLength / 2) / (1 - this.handleLength));
+			}
+		},
+		mouseUp() {
+			this.dragging = false;
+		},
+		mouseMove(e: MouseEvent) {
+			if (this.dragging) {
+				this.updateHandlePosition(e);
+			}
+		},
+		changePosition(difference: number) {
+			this.clampHandlePosition(this.handlePosition + difference / this.trackLength());
+		},
+	},
 });
 </script>

frontend/src/utilities/response-handler.ts

@@ -14,6 +14,7 @@ const state = reactive({
 
 export enum ResponseType {
 	UpdateCanvas = "UpdateCanvas",
+	UpdateScrollbars = "UpdateScrollbars",
 	ExportDocument = "ExportDocument",
 	SaveDocument = "SaveDocument",
 	OpenDocumentBrowse = "OpenDocumentBrowse",
@@ -66,6 +67,8 @@ function parseResponse(responseType: string, data: any): Response {
 			return newUpdateOpenDocumentsList(data.UpdateOpenDocumentsList);
 		case "UpdateCanvas":
 			return newUpdateCanvas(data.UpdateCanvas);
+		case "UpdateScrollbars":
+			return newUpdateScrollbars(data.UpdateScrollbars);
 		case "UpdateLayer":
 			return newUpdateLayer(data.UpdateLayer);
 		case "SetCanvasZoom":
@@ -91,7 +94,7 @@ function parseResponse(responseType: string, data: any): Response {
 	}
 }
 
-export type Response = SetActiveTool | UpdateCanvas | DocumentChanged | CollapseFolder | ExpandFolder | UpdateWorkingColors | SetCanvasZoom | SetCanvasRotation;
+export type Response = SetActiveTool | UpdateCanvas | UpdateScrollbars | DocumentChanged | CollapseFolder | ExpandFolder | UpdateWorkingColors | SetCanvasZoom | SetCanvasRotation;
 
 export interface UpdateOpenDocumentsList {
 	open_documents: Array<string>;
@@ -171,6 +174,19 @@ function newUpdateCanvas(input: any): UpdateCanvas {
 	};
 }
 
+export interface UpdateScrollbars {
+	position: { x: number; y: number };
+	size: { x: number; y: number };
+	multiplier: { x: number; y: number };
+}
+function newUpdateScrollbars(input: any): UpdateScrollbars {
+	return {
+		position: { x: input.position[0], y: input.position[1] },
+		size: { x: input.size[0], y: input.size[1] },
+		multiplier: { x: input.multiplier[0], y: input.multiplier[1] },
+	};
+}
+
 export interface ExportDocument {
 	document: string;
 	name: string;

frontend/wasm/src/document.rs

@@ -305,6 +305,13 @@ pub fn set_rotation(new_radians: f64) -> Result<(), JsValue> {
 	EDITOR_STATE.with(|editor| editor.borrow_mut().handle_message(ev)).map_err(convert_error)
 }
 
+/// Translates document (in viewport coords)
+#[wasm_bindgen]
+pub fn translate_canvas(delta_x: f64, delta_y: f64) -> Result<(), JsValue> {
+	let ev = MovementMessage::TranslateCanvas((delta_x, delta_y).into());
+	EDITOR_STATE.with(|editor| editor.borrow_mut().handle_message(ev)).map_err(convert_error)
+}
+
 /// Update the list of selected layers. The layer paths have to be stored in one array and are separated by LayerId::MAX
 #[wasm_bindgen]
 pub fn select_layers(paths: Vec<LayerId>) -> Result<(), JsValue> {