From 5bc24d4a04f6c6d82b6b34724642790b884eef5f Mon Sep 17 00:00:00 2001
From: Fornax <wim@fornaxian.tech>
Date: Thu, 11 Apr 2024 18:51:45 +0200
Subject: [PATCH] Move loading spinner to bottom of page to fix z-index

---
 svelte/src/file_viewer/FileViewer.svelte            | 5 +++--
 svelte/src/file_viewer/viewers/SwipeNavigate.svelte | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/svelte/src/file_viewer/FileViewer.svelte b/svelte/src/file_viewer/FileViewer.svelte
index 24dfde9..f753924 100644
--- a/svelte/src/file_viewer/FileViewer.svelte
+++ b/svelte/src/file_viewer/FileViewer.svelte
@@ -366,8 +366,6 @@ const keyboard_event = evt => {
 <svelte:window on:keydown={keyboard_event} on:hashchange={hash_change}/>
 
 <div class="file_viewer">
-	<LoadingIndicator loading={loading}/>
-
 	<div class="headerbar">
 		{#if !disable_menu}
 			<button
@@ -582,6 +580,9 @@ const keyboard_event = evt => {
 			on:loading={e => {loading = e.detail}}
 		/>
 	{/if}
+
+	<!-- At the bottom so it renders over everything else -->
+	<LoadingIndicator loading={loading}/>
 </div>
 
 <style>
diff --git a/svelte/src/file_viewer/viewers/SwipeNavigate.svelte b/svelte/src/file_viewer/viewers/SwipeNavigate.svelte
index faa9689..9ee7fdd 100644
--- a/svelte/src/file_viewer/viewers/SwipeNavigate.svelte
+++ b/svelte/src/file_viewer/viewers/SwipeNavigate.svelte
@@ -52,6 +52,11 @@ export const swipe_nav = (node, swipe_enabled) => {
 			detail += "transition: transform 500ms;"
 		}
 
+		// Clear the transformation if the offset is zero
+		if (off === 0) {
+			detail = ""
+		}
+
 		node.dispatchEvent(new CustomEvent("style", {detail: detail}))
 	}