Fix moving window on windows

Use WindowDecorationMargin to not cover window decorations
affederaffe · Nov 16, 2023 · bc327fc · bc327fc
1 parent dd169e3
commit bc327fc
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/BeatSaberModManager/Resources/Styles/HamburgerMenu.axaml b/BeatSaberModManager/Resources/Styles/HamburgerMenu.axaml
@@ -149,11 +149,13 @@
         <Setter Property="TabStripPlacement" Value="Left" />
         <Setter Property="Template">
             <ControlTemplate>
-                <Panel Background="{TemplateBinding PaneBackground}">
+                <Panel Background="{x:Null}">
+                    <Rectangle Fill="{TemplateBinding PaneBackground}" IsHitTestVisible="False" />
                     <SplitView x:Name="PART_NavigationPane"
                                CompactPaneLength="{StaticResource PaneCompactWidth}"
                                DisplayMode="Inline"
                                IsPaneOpen="True"
+                               Margin="{TemplateBinding ContentMargin}"
                                OpenPaneLength="{StaticResource PaneExpandWidth}"
                                PaneBackground="Transparent">
                         <SplitView.Pane>

diff --git a/BeatSaberModManager/Views/Controls/HamburgerMenu.cs b/BeatSaberModManager/Views/Controls/HamburgerMenu.cs
@@ -30,6 +30,11 @@ public class HamburgerMenu : TabControl
         /// </summary>
         public static readonly StyledProperty<int> ExpandedModeThresholdWidthProperty = AvaloniaProperty.Register<HamburgerMenu, int>(nameof(ExpandedModeThresholdWidth), 1008);
 
+        /// <summary>
+        /// Defines the <see cref="ContentMarginProperty "/> property.
+        /// </summary>
+        public static readonly StyledProperty<Thickness> ContentMarginProperty = AvaloniaProperty.Register<HamburgerMenu, Thickness>(nameof(ContentMargin));
+
         /// <summary>
         /// Gets or sets the brush used to draw the pane's background.
         /// </summary>
@@ -57,6 +62,15 @@ public int ExpandedModeThresholdWidth
             set => SetValue(ExpandedModeThresholdWidthProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets margin of the content.
+        /// </summary>
+        public Thickness ContentMargin
+        {
+            get => GetValue(ContentMarginProperty);
+            set => SetValue(ContentMarginProperty, value);
+        }
+
         /// <inheritdoc />
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {

diff --git a/BeatSaberModManager/Views/Windows/MainWindow.axaml b/BeatSaberModManager/Views/Windows/MainWindow.axaml
@@ -11,6 +11,7 @@
         x:Class="BeatSaberModManager.Views.Windows.MainWindow"
         x:DataType="vm:MainWindowViewModel"
         Name="Window"
+        Margin="{Binding #Window.OffScreenMargin}"
         TransparencyLevelHint="Mica, Blur, None"
         Title="{StaticResource MainWindow:Title}"
         Icon="/Resources/Icons/Icon.ico"
@@ -22,7 +23,7 @@
         <cv:StatusTypeEnumConverter x:Key="StatusTypeEnumConverter" />
     </Window.Resources>
 
-    <c:HamburgerMenu x:Name="HamburgerMenu" Margin="{Binding #Window.OffScreenMargin}" SelectedIndex="{Binding SettingsViewModel.TabIndex, Mode=TwoWay}">
+    <c:HamburgerMenu x:Name="HamburgerMenu" Margin="{Binding #Window.OffScreenMargin}" ContentMargin="{Binding #Window.WindowDecorationMargin}" SelectedIndex="{Binding SettingsViewModel.TabIndex, Mode=TwoWay}">
         <TabItem>
             <p:IntroPage />
             <TabItem.Header>

diff --git a/BeatSaberModManager/Views/Windows/MainWindow.axaml.cs b/BeatSaberModManager/Views/Windows/MainWindow.axaml.cs
@@ -1,10 +1,18 @@
 using System;
+using System.Linq;
+using System.Reactive.Linq;
 
 using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Chrome;
+using Avalonia.Controls.Primitives;
 using Avalonia.ReactiveUI;
+using Avalonia.VisualTree;
 
 using BeatSaberModManager.ViewModels;
 
+using ReactiveUI;
+
 
 namespace BeatSaberModManager.Views.Windows
 {
@@ -27,7 +35,6 @@ public MainWindow(MainWindowViewModel viewModel)
             InitializeComponent();
             ViewModel = viewModel;
             ExtendClientAreaToDecorationsHint = !OperatingSystem.IsLinux();
-            Margin = ExtendClientAreaToDecorationsHint ? WindowDecorationMargin : new Thickness();
             viewModel.PickInstallDirInteraction.RegisterHandler(async context => context.SetOutput(await new InstallFolderDialogWindow().ShowDialog<string?>(this).ConfigureAwait(false)));
         }
     }