Merge pull request #1430 from Hans5958/live-love-life/2.1

Various "minor" changes (2.1)

web/_js/main/main.js

@@ -398,7 +398,7 @@ async function init() {
 	)
 
 	function mousemove(x, y) {
-		if (dragging) {
+		if (!dragging) return
 		container.style.cursor = "move"
 
 		const deltaX = x - lastPosition[0]
@@ -414,7 +414,6 @@ async function init() {
 		updateLines()
 		applyView()
 	}
-	}
 
 	function touchmove(e) {
 

web/_js/main/view.js

@@ -9,6 +9,9 @@ const linesCanvas = document.getElementById("linesCanvas")
 const linesContext = linesCanvas.getContext("2d")
 let hovered = []
 
+let previousScaleZoomOrigin
+let previousZoom
+
 const backgroundCanvas = document.createElement("canvas")
 backgroundCanvas.width = canvasSize.x
 backgroundCanvas.height = canvasSize.y
@@ -400,36 +403,40 @@ function buildObjectsList(filter = null, sort = null) {
 		const entry = sortedAtlas[i]
 
 		element.addEventListener("mouseenter", function () {
-			if (!fixed && !dragging) {
+			if (fixed || dragging) return
 			objectsContainer.replaceChildren()
 
-				previousZoomOrigin = [zoomOrigin[0], zoomOrigin[1]]
-				previousScaleZoomOrigin = [scaleZoomOrigin[0], scaleZoomOrigin[1]]
-
-				applyView()
+			previousScaleZoomOrigin ??= [...scaleZoomOrigin]
+			previousZoom ??= zoom
 			setView(entry.center[0], entry.center[1], setZoomByPath(entry.path))
 
 			hovered = [entry]
 			render()
 			hovered[0].element = this
 			updateLines()
-			}
 
 		})
 
 		element.addEventListener("click", e => {
 			toggleFixed(e)
-			if (fixed) {
+			if (!fixed) return
+			previousScaleZoomOrigin ??= [...scaleZoomOrigin]
+			previousZoom ??= zoom
 			applyView()
-			}
 		})
 
 		element.addEventListener("mouseleave", function () {
-			if (!fixed && !dragging) {
+			if (fixed || dragging) return
+
+			scaleZoomOrigin = [...previousScaleZoomOrigin]
+			zoom = previousZoom
+			previousScaleZoomOrigin = undefined
+			previousZoom = undefined
+			applyView()
+
 			hovered = []
 			updateLines()
 			render()
-			}
 		})
 
 		entriesList.appendChild(element)