From a264194772891346cb48a5fd76e495c21467ed3d Mon Sep 17 00:00:00 2001
From: qinware <qinware@163.com>
Date: Tue, 16 Sep 2025 18:42:32 +0800
Subject: [PATCH] Optimize Window Template for linux

---
 .../Window/Themes/WindowTheme.axaml           | 22 ++++++++++++++++---
 src/AtomUI.Controls/Window/Window.cs          | 21 ++++++------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/AtomUI.Controls/Window/Themes/WindowTheme.axaml b/src/AtomUI.Controls/Window/Themes/WindowTheme.axaml
index 21be9065f..485920874 100644
--- a/src/AtomUI.Controls/Window/Themes/WindowTheme.axaml
+++ b/src/AtomUI.Controls/Window/Themes/WindowTheme.axaml
@@ -12,7 +12,9 @@
                 <Border Name="WindowFrame"
                         Background="{TemplateBinding Background}"
                         CornerRadius="{TemplateBinding CornerRadius}"
-                        BackgroundSizing="InnerBorderEdge"
+                        BackgroundSizing="InnerBorderEdge"/>
+                <Border Name="BodyFrame"
+                        CornerRadius="{TemplateBinding CornerRadius}"
                         ClipToBounds="True">
                     <atom:VisualLayerManager Padding="{TemplateBinding OffScreenMargin, Mode=OneWay}">
                         <DockPanel LastChildFill="True" Name="{x:Static atom:WindowThemeConstants.ContentLayoutPart}">
@@ -33,12 +35,10 @@
                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
                             </Border>
-
                         </DockPanel>
                     </atom:VisualLayerManager>
                 </Border>
             </Panel>
-
         </ControlTemplate>
     </Setter>
 
@@ -80,12 +80,28 @@
             </Setter>
             <Setter Property="BorderBrush" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorBorder}}" />
         </Style>
+        
+        <Style Selector="^ /template/ Border#BodyFrame">
+            <Setter Property="Padding">
+                <OnPlatform>
+                    <On Options="Default">
+                        <Thickness>0</Thickness>
+                    </On>
+                    <On Options="Linux">
+                        <Thickness>1</Thickness>
+                    </On>
+                </OnPlatform>
+            </Setter>
+        </Style>
 
         <Style Selector="^[WindowState=FullScreen], ^[WindowState=Maximized]">
             <Setter Property="CornerRadius" Value="0" />
             <Style Selector="^ /template/ Border#WindowFrame">
                 <Setter Property="BorderThickness" Value="0" />
             </Style>
+            <Style Selector="^ /template/ Border#BodyFrame">
+                <Setter Property="Padding" Value="0" />
+            </Style>
         </Style>
 
         <Setter Property="SystemDecorations">
diff --git a/src/AtomUI.Controls/Window/Window.cs b/src/AtomUI.Controls/Window/Window.cs
index ca37d1c1a..d743a13e3 100644
--- a/src/AtomUI.Controls/Window/Window.cs
+++ b/src/AtomUI.Controls/Window/Window.cs
@@ -62,7 +62,6 @@ public class Window : AvaloniaWindow, IOperationSystemAware, IDisposable
     public static readonly StyledProperty<bool> IsResizeEnabledProperty =
         AvaloniaProperty.Register<Window, bool>(nameof(IsResizeEnabled), defaultValue: true);
     
-#if PLATFORM_MACOS
     public static readonly StyledProperty<Point> MacOSCaptionGroupOffsetProperty =
         AvaloniaProperty.Register<Window, Point>(nameof(MacOSCaptionGroupOffset), defaultValue: new Point(10, 0));
     
@@ -72,10 +71,9 @@ public class Window : AvaloniaWindow, IOperationSystemAware, IDisposable
     public static readonly DirectProperty<Window, Thickness> MacOSTitleBarMarginProperty = 
         AvaloniaProperty.RegisterDirect<Window, Thickness>(nameof (MacOSTitleBarMargin), 
             o => o.MacOSTitleBarMargin);
-
+    
     public static readonly StyledProperty<OperationSystemType> OperationSystemTypeProperty =
         OperationSystemAwareControlProperty.OperationSystemTypeProperty.AddOwner<Window>();
-#endif
     
     public double TitleFontSize
     {
@@ -161,7 +159,6 @@ public class Window : AvaloniaWindow, IOperationSystemAware, IDisposable
         set => SetValue(IsResizeEnabledProperty, value);
     }
     
-#if PLATFORM_MACOS
     public Point MacOSCaptionGroupOffset
     {
         get => GetValue(MacOSCaptionGroupOffsetProperty);
@@ -182,7 +179,6 @@ public class Window : AvaloniaWindow, IOperationSystemAware, IDisposable
     private Thickness _macOSTitleBarMargin;
     
     public OperationSystemType OperationSystemType => GetValue(OperationSystemTypeProperty);
-#endif
     
     #endregion
 
@@ -238,16 +234,15 @@ public class Window : AvaloniaWindow, IOperationSystemAware, IDisposable
             }
             HandleWindowStateChanged(oldWindowState, newWindowState);
         }
-
+#if PLATFORM_MACOS
         if (this.IsAttachedToVisualTree())
         {
             if (change.Property == IsCloseCaptionButtonEnabledProperty)
             {
-#if PLATFORM_MACOS
                 this.SetMacOSWindowClosable(IsCloseCaptionButtonEnabled);
-#endif
             }
         }
+#endif
     }
     
     private void HandleWindowStateChanged(WindowState oldState, WindowState newState)
@@ -404,14 +399,11 @@ public class Window : AvaloniaWindow, IOperationSystemAware, IDisposable
         _disposeActions.Clear();
     }
 
+#if PLATFORM_MACOS
     protected override void OnSizeChanged(SizeChangedEventArgs e)
     {
         base.OnSizeChanged(e);
-        
-        if (OperatingSystem.IsMacCatalyst() || OperatingSystem.IsMacOS())
-        {
-            ConfigureMacOSCaptionGroupOffset();
-        }
+        ConfigureMacOSCaptionGroupOffset();
     }
 
     private void ConfigureMacOSCaptionGroupOffset()
@@ -420,7 +412,8 @@ public class Window : AvaloniaWindow, IOperationSystemAware, IDisposable
         var cationsSize = this.GetMacOSOptionsSize(MacOSCaptionGroupSpacing);
         MacOSTitleBarMargin = new Thickness(cationsSize.Width + MacOSCaptionGroupOffset.X, 0, 0, 0);
     }
-
+#endif
+    
     void IOperationSystemAware.SetOperationSystemType(OperationSystemType operationSystemType)
     {
         SetValue(OperationSystemTypeProperty, operationSystemType);