From 7380e243c4f74b81b6d3d25540817950fbc18c32 Mon Sep 17 00:00:00 2001
From: Michel EDIGHOFFER <edimitchel@gmail.com>
Date: Sun, 5 Feb 2023 16:35:21 +0100
Subject: [PATCH] fix: make nav title sticky + add more grabbale area for
 native (#1602)

---
 components/main/MainContent.vue | 6 +++---
 components/nav/NavSide.vue      | 1 -
 components/nav/NavTitle.vue     | 2 +-
 layouts/default.vue             | 8 ++++----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/components/main/MainContent.vue b/components/main/MainContent.vue
index 7695c254..b0cf4041 100644
--- a/components/main/MainContent.vue
+++ b/components/main/MainContent.vue
@@ -20,8 +20,8 @@ const wideLayout = computed(() => route.meta.wideLayout ?? false)
       border="b base" bg="[rgba(var(--rgb-bg-base),0.7)]"
       class="native:lg:w-[calc(100vw-5rem)] native:xl:w-[calc(135%+(100vw-1200px)/2)]"
     >
-      <div flex justify-between px5 py2 :class="{ 'xl:hidden': $route.name !== 'tag' }" data-tauri-drag-region class="native:xl:flex">
-        <div flex gap-3 items-center :overflow-hidden="!noOverflowHidden ? '' : false" py2 w-full class="native-mac:pl-14 native-mac:sm:pl-0">
+      <div flex justify-between px5 py2 :class="{ 'xl:hidden': $route.name !== 'tag' }" class="native:xl:flex">
+        <div flex gap-3 items-center :overflow-hidden="!noOverflowHidden ? '' : false" py2 w-full>
           <NuxtLink
             v-if="backOnSmallScreen || back" flex="~ gap1" items-center btn-text p-0 xl:hidden
             :aria-label="$t('nav.back')"
@@ -29,7 +29,7 @@ const wideLayout = computed(() => route.meta.wideLayout ?? false)
           >
             <div i-ri:arrow-left-line class="rtl-flip" />
           </NuxtLink>
-          <div :truncate="!noOverflowHidden ? '' : false" w-full>
+          <div :truncate="!noOverflowHidden ? '' : false" flex w-full data-tauri-drag-region class="native-mac:justify-center native-mac:text-center native-mac:sm:justify-start">
             <slot name="title" />
           </div>
           <div sm:hidden h-7 w-1px />
diff --git a/components/nav/NavSide.vue b/components/nav/NavSide.vue
index 99a69550..b4a05591 100644
--- a/components/nav/NavSide.vue
+++ b/components/nav/NavSide.vue
@@ -7,7 +7,6 @@ const { notifications } = useNotifications()
 
 <template>
   <nav sm:px3 flex="~ col gap2" shrink text-size-base leading-normal md:text-lg h-full>
-    <div shrink hidden sm:block mt-4 />
     <SearchWidget lg:ms-1 lg:me-5 hidden xl:block />
     <NavSideItem :text="$t('nav.search')" :to="isHydrated ? `/${currentServer}/explore` : '/explore'" icon="i-ri:search-line" hidden sm:block xl:hidden :command="command" />
 
diff --git a/components/nav/NavTitle.vue b/components/nav/NavTitle.vue
index e0ac1aa7..e4a7e7d9 100644
--- a/components/nav/NavTitle.vue
+++ b/components/nav/NavTitle.vue
@@ -18,7 +18,7 @@ router.afterEach(() => {
 </script>
 
 <template>
-  <div flex justify-between>
+  <div flex justify-between sticky top-0 bg-base z-1 py-4 native:py-7 data-tauri-drag-region>
     <NuxtLink
       flex items-end gap-3
       py2 px-5
diff --git a/layouts/default.vue b/layouts/default.vue
index b1e5ed6b..367db91e 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -15,12 +15,12 @@ const isGrayscale = usePreferences('grayscaleMode')
 </script>
 
 <template>
-  <div h-full :data-mode="isHydrated && isGrayscale ? 'grayscale' : ''">
+  <div h-full :data-mode="isHydrated && isGrayscale ? 'grayscale' : ''" data-tauri-drag-region>
     <main flex w-full mxa lg:max-w-80rem class="native:grid native:sm:grid-cols-[auto_1fr] native:lg:grid-cols-[auto_minmax(600px,2fr)_1fr]">
-      <aside class="native:w-auto w-1/8 md:w-1/6 lg:w-1/5 xl:w-1/4 zen-hide" hidden sm:flex justify-end xl:me-4 relative>
+      <aside class="native:w-auto w-1/8 md:w-1/6 lg:w-1/5 xl:w-1/4 zen-hide" hidden sm:flex justify-end xl:me-4 native:me-0 relative>
         <div sticky top-0 w-20 xl:w-100 h-screen flex="~ col" lt-xl-items-center>
           <slot name="left">
-            <div flex="~ col" overflow-y-auto justify-between h-full max-w-full pt-5 native:pt-7 overflow-x-hidden>
+            <div flex="~ col" overflow-y-auto justify-between h-full max-w-full overflow-x-hidden>
               <NavTitle />
               <NavSide command />
               <div flex-auto />
@@ -59,7 +59,7 @@ const isGrayscale = usePreferences('grayscaleMode')
           <NavBottom v-if="isHydrated" sm:hidden />
         </div>
       </div>
-      <aside v-if="isHydrated && !wideLayout" class="hidden w-1/4 sm:none lg:block zen-hide">
+      <aside v-if="isHydrated && !wideLayout" class="hidden lg:w-1/5 xl:w-1/4 sm:none xl:block native:w-full zen-hide">
         <div sticky top-0 h-screen flex="~ col" gap-2 py3 ms-2>
           <slot name="right">
             <div flex-auto />