From ab22e0aeb04b121cd38d1d324ce434400a35a98c Mon Sep 17 00:00:00 2001
From: Pat Hartl <pat@pathar.tl>
Date: Thu, 28 May 2026 00:14:22 -0500
Subject: [PATCH] Fix scrollbar being overlapped by titlebar

---
 LANCommander.Launcher.Avalonia/App.axaml                  | 8 ++++++++
 LANCommander.Launcher.Avalonia/Views/DepotView.axaml      | 3 ++-
 LANCommander.Launcher.Avalonia/Views/GameDetailView.axaml | 3 ++-
 LANCommander.Launcher.Avalonia/Views/GamesGridView.axaml  | 1 +
 .../Views/GamesGroupedView.axaml                          | 1 +
 LANCommander.Launcher.Avalonia/Views/GamesRowView.axaml   | 2 +-
 LANCommander.Launcher.Avalonia/Views/GamesShelfView.axaml | 3 ++-
 LANCommander.Launcher.Avalonia/Views/LibraryRowView.axaml | 3 ++-
 8 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/LANCommander.Launcher.Avalonia/App.axaml b/LANCommander.Launcher.Avalonia/App.axaml
index 45d924e1..7ee61307 100644
--- a/LANCommander.Launcher.Avalonia/App.axaml
+++ b/LANCommander.Launcher.Avalonia/App.axaml
@@ -25,6 +25,14 @@
             <Setter Property="FontSize" Value="16" />
         </Style>
 
+        <!-- Offset the vertical scrollbar so it doesn't overlap the floating titlebar -->
+        <Style Selector="ScrollViewer.TitlebarOffset /template/ ScrollBar#PART_VerticalScrollBar">
+            <Setter Property="Margin" Value="0,40,0,0" />
+        </Style>
+        <Style Selector="ListBox.TitlebarOffset /template/ ScrollViewer /template/ ScrollBar#PART_VerticalScrollBar">
+            <Setter Property="Margin" Value="0,40,0,0" />
+        </Style>
+
         <!-- Icon control template (PathIcon ControlTheme is not inherited by subclasses in Avalonia 11) -->
         <!-- Default: stroke-based rendering for Regular, Light, Thin, DuoTone, Bold variants -->
         <Style Selector="Icon">
diff --git a/LANCommander.Launcher.Avalonia/Views/DepotView.axaml b/LANCommander.Launcher.Avalonia/Views/DepotView.axaml
index 33b9d7cd..410f8241 100644
--- a/LANCommander.Launcher.Avalonia/Views/DepotView.axaml
+++ b/LANCommander.Launcher.Avalonia/Views/DepotView.axaml
@@ -24,7 +24,8 @@
         </Style>
     </UserControl.Styles>
 
-    <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+    <ScrollViewer Classes="TitlebarOffset"
+                  HorizontalScrollBarVisibility="Disabled"
                   controls:ScrollPersistence.ViewModel="{Binding}">
         <StackPanel Margin="10,48,10,24" Spacing="32" Grid.IsSharedSizeScope="True">
 
diff --git a/LANCommander.Launcher.Avalonia/Views/GameDetailView.axaml b/LANCommander.Launcher.Avalonia/Views/GameDetailView.axaml
index d54f849e..d62f0431 100644
--- a/LANCommander.Launcher.Avalonia/Views/GameDetailView.axaml
+++ b/LANCommander.Launcher.Avalonia/Views/GameDetailView.axaml
@@ -20,7 +20,8 @@
         </Style>
     </UserControl.Styles>
 
-    <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+    <ScrollViewer Classes="TitlebarOffset"
+                  HorizontalScrollBarVisibility="Disabled"
                   GotFocus="OnScrollViewerGotFocus">
         <Grid RowDefinitions="Auto,*">
 
diff --git a/LANCommander.Launcher.Avalonia/Views/GamesGridView.axaml b/LANCommander.Launcher.Avalonia/Views/GamesGridView.axaml
index cc2579e1..4f7f1d5f 100644
--- a/LANCommander.Launcher.Avalonia/Views/GamesGridView.axaml
+++ b/LANCommander.Launcher.Avalonia/Views/GamesGridView.axaml
@@ -9,6 +9,7 @@
              x:DataType="vm:GamesCollectionViewModel">
 
     <ScrollViewer x:Name="FlatGridScrollViewer"
+                  Classes="TitlebarOffset"
                   HorizontalScrollBarVisibility="Disabled"
                   VerticalScrollBarVisibility="Auto"
                   controls:ScrollPersistence.ViewModel="{Binding}"
diff --git a/LANCommander.Launcher.Avalonia/Views/GamesGroupedView.axaml b/LANCommander.Launcher.Avalonia/Views/GamesGroupedView.axaml
index 6803dece..056338eb 100644
--- a/LANCommander.Launcher.Avalonia/Views/GamesGroupedView.axaml
+++ b/LANCommander.Launcher.Avalonia/Views/GamesGroupedView.axaml
@@ -14,6 +14,7 @@
              so all group headers are always realized and A-Z index scrolling works.
              Inner per-group repeaters remain virtualizing for cover/list items. -->
         <ScrollViewer x:Name="GroupedScrollViewer"
+                      Classes="TitlebarOffset"
                       Grid.Column="0"
                       HorizontalScrollBarVisibility="Disabled"
                       VerticalScrollBarVisibility="Auto"
diff --git a/LANCommander.Launcher.Avalonia/Views/GamesRowView.axaml b/LANCommander.Launcher.Avalonia/Views/GamesRowView.axaml
index 5dbca805..b0dd923c 100644
--- a/LANCommander.Launcher.Avalonia/Views/GamesRowView.axaml
+++ b/LANCommander.Launcher.Avalonia/Views/GamesRowView.axaml
@@ -46,7 +46,7 @@
     </UserControl.Styles>
 
     <ListBox x:Name="GamesListBox"
-             Classes="GamesList"
+             Classes="GamesList TitlebarOffset"
              ItemsSource="{Binding Games}"
              SelectedItem="{Binding SelectedGame}"
              Padding="0,56,0,0"
diff --git a/LANCommander.Launcher.Avalonia/Views/GamesShelfView.axaml b/LANCommander.Launcher.Avalonia/Views/GamesShelfView.axaml
index df549f45..e195e0db 100644
--- a/LANCommander.Launcher.Avalonia/Views/GamesShelfView.axaml
+++ b/LANCommander.Launcher.Avalonia/Views/GamesShelfView.axaml
@@ -7,7 +7,8 @@
              x:Class="LANCommander.Launcher.Avalonia.Views.GamesShelfView"
              x:DataType="vm:GamesCollectionViewModel">
 
-    <ScrollViewer HorizontalScrollBarVisibility="Auto"
+    <ScrollViewer Classes="TitlebarOffset"
+                  HorizontalScrollBarVisibility="Auto"
                   VerticalScrollBarVisibility="Disabled"
                   controls:ScrollPersistence.ViewModel="{Binding}">
         <ItemsRepeater ItemsSource="{Binding Games}" Margin="12,52,12,24" ClipToBounds="False"
diff --git a/LANCommander.Launcher.Avalonia/Views/LibraryRowView.axaml b/LANCommander.Launcher.Avalonia/Views/LibraryRowView.axaml
index ff55dabc..627cde90 100644
--- a/LANCommander.Launcher.Avalonia/Views/LibraryRowView.axaml
+++ b/LANCommander.Launcher.Avalonia/Views/LibraryRowView.axaml
@@ -54,7 +54,7 @@
                 BorderThickness="0,0,1,0"
                 Margin="0,48,0,0">
             <ListBox x:Name="GameListBox"
-                     Classes="CompactGamesList"
+                     Classes="CompactGamesList TitlebarOffset"
                      ItemsSource="{Binding Games}"
                      SelectedItem="{Binding SelectedGame}"
                      ScrollViewer.HorizontalScrollBarVisibility="Disabled"
@@ -88,6 +88,7 @@
 
         <!-- ═══ RIGHT PANEL: Carousels + Grid ═══ -->
         <ScrollViewer x:Name="RightPanelScrollViewer"
+                      Classes="TitlebarOffset"
                       Grid.Column="1"
                       HorizontalScrollBarVisibility="Disabled"
                       VerticalScrollBarVisibility="Auto"