Update host window style

wieslawsoltes · Sep 16, 2023 · e8e7340 · e8e7340
1 parent a7842f0
commit e8e7340
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Dock.Avalonia/Controls/HostWindow.axaml b/src/Dock.Avalonia/Controls/HostWindow.axaml
@@ -53,9 +53,10 @@
 
     <Style Selector="^:toolwindow">
 
-      <Setter Property="SystemDecorations" Value="None" />
+      <Setter Property="SystemDecorations" Value="Full" />
       <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
-      <Setter Property="ExtendClientAreaChromeHints" Value="PreferSystemChrome" />
+      <Setter Property="ExtendClientAreaChromeHints" Value="NoChrome" />
+      <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="0" />
 
       <Setter Property="Template">
         <ControlTemplate>

diff --git a/src/Dock.Avalonia/Controls/ToolChromeControl.axaml.cs b/src/Dock.Avalonia/Controls/ToolChromeControl.axaml.cs
@@ -81,7 +81,8 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         base.OnApplyTemplate(e);
 
         //On linux we dont attach to the HostWindow because of inconsistent drag behaviour
-        if (VisualRoot is HostWindow window && RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        if (VisualRoot is HostWindow window 
+            && (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX)))
         {
             Grip = e.NameScope.Find<Control>("PART_Grip");
             CloseButton = e.NameScope.Find<Button>("PART_CloseButton");