From ee54c49aefb387dd47bd582e6c7da573bc6cc3bc Mon Sep 17 00:00:00 2001
From: vicrodh <103399283+vicrodh@users.noreply.github.com>
Date: Sat, 9 May 2026 17:49:07 -0600
Subject: [PATCH] revert: roll back PR #406 (linux-titlebar-draggable)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reverts merge f7623154 which built macOS support on top of the variant
rendering infrastructure introduced by titlebar-mode-selector. With the
variant system gone (previous revert), PR #406's changes (class:macos,
stripped strip with traffic-light reservation, macOS-aware drag bands)
reference dead architecture.

Most of PR #406 was already removed by the previous revert via file
checkouts; this commit cleans up the residual macOS-specific cosmetics
in Sidebar.svelte and +page.svelte (padding-top 36→32, drag-region
height 32→28, macos main-content padding restored to generic rule).

PR #407 (sticky home header fix, ac627d43) is preserved — independent
from titlebar work, only touches HomeView.svelte.

cc
---
 src/lib/components/Sidebar.svelte |  5 ++---
 src/routes/+page.svelte           | 19 +++++++------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/lib/components/Sidebar.svelte b/src/lib/components/Sidebar.svelte
index f1f0ca265..9bc2f8bdb 100644
--- a/src/lib/components/Sidebar.svelte
+++ b/src/lib/components/Sidebar.svelte
@@ -2515,10 +2515,9 @@
     height: calc(100vh - 104px); /* Only 104px NowPlayingBar, no title bar */
   }
 
-  /* macOS hidden mode: pad sidebar top so search clears the traffic lights
-     that the OS still draws via TitleBarStyle::Overlay. */
+  /* macOS: pad top of sidebar to clear native traffic light buttons */
   :global(html.macos) .sidebar.no-titlebar {
-    padding-top: 36px;
+    padding-top: 32px;
   }
 
   .content {
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 13db2c1dc..241e30953 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -5755,11 +5755,7 @@
     class:match-chrome={matchSystemChrome && showTitleBar && windowTransparent}
     style="--chrome-radius: {chromeRadiusPx}px;"
   >
-    <!-- macOS: when the user hides the qbz strip (mode='hidden'), the OS
-         still draws traffic lights via TitleBarStyle::Overlay on top of
-         the sidebar. This invisible band gives the window something to
-         drag and reserves the same vertical real estate the strip would
-         have. -->
+    <!-- macOS: drag region for window movement (overlay title bar has no native drag area) -->
     {#if !showTitleBar && platform === 'macos'}
       <div class="macos-drag-region" data-tauri-drag-region></div>
     {/if}
@@ -7204,21 +7200,20 @@
     height: calc(100vh - var(--player-bar-height, 104px));
   }
 
-  /* macOS hidden mode: pad main content to clear native overlay traffic
-     lights. Only fires when the qbz strip isn't mounted. */
-  :global(html.macos) .app.no-titlebar .main-content {
+  /* macOS: pad main content to clear native overlay title bar */
+  :global(html.macos) .main-content {
     padding-top: 16px;
     height: calc(100vh - 104px - 16px);
   }
 
-  :global(html.macos) .app.no-titlebar .main-content :global(.home-view) {
+  /* macOS: home view handles its own spacing */
+  :global(html.macos) .main-content :global(.home-view) {
     margin-top: -16px;
   }
 
-  /* macOS hidden mode: invisible drag region for window movement, mirrors
-     the band the qbz strip would otherwise occupy. */
+  /* macOS: invisible drag region for window movement (overlay title bar) */
   :global(html.macos) .macos-drag-region {
-    height: 32px;
+    height: 28px;
     width: 100%;
     position: absolute;
     top: 0;