From 5e43c3a10241e77cb11b8ca1b82101ed81a7c793 Mon Sep 17 00:00:00 2001 From: Xylight Date: Sun, 26 May 2024 13:35:54 -0700 Subject: [PATCH] feat: add adaptive nav positioning --- src/lib/components/ui/layout/Shell.svelte | 61 ++++++++++++++++------ src/lib/components/ui/navbar/Navbar.svelte | 18 ++++++- src/lib/settings.ts | 8 +-- src/routes/settings/+page.svelte | 20 ++++--- 4 files changed, 80 insertions(+), 27 deletions(-) diff --git a/src/lib/components/ui/layout/Shell.svelte b/src/lib/components/ui/layout/Shell.svelte index 026adf44..e815d00f 100644 --- a/src/lib/components/ui/layout/Shell.svelte +++ b/src/lib/components/ui/layout/Shell.svelte @@ -27,34 +27,65 @@ return 'hi this is easter egg, my code broke' } - $: contentPadding = calculatePadding( - $userSettings.dock.noGap, - $userSettings.dock.top, - true - ) - $: sidePadding = calculatePadding( - $userSettings.dock.noGap, - $userSettings.dock.top, - false - ) + let screenWidth = 1000 + + const calculateDockProperties = ( + settings: typeof $userSettings.dock, + screenWidth: number + ): { + noGap: boolean + top: boolean + } => { + let panel = false + let top = false + + if (screenWidth > 1000) { + panel = true + top = true + } else if (screenWidth > 800) { + panel = true + top = false + } else if (screenWidth > 600) { + panel = false + top = false + } + + panel = settings.noGap ?? panel + top = settings.top ?? top + + return { + noGap: panel, + top: top, + } + } + + $: dockProps = calculateDockProperties($userSettings.dock, screenWidth) + + $: contentPadding = calculatePadding(dockProps.noGap, dockProps.top, true) + $: sidePadding = calculatePadding(dockProps.noGap, dockProps.top, false) $: topPanel = $userSettings.dock.noGap && $userSettings.dock.top + +