Update Window.xaml

iNKORE-NET · Jul 19, 2024 · a101ca0 · a101ca0
1 parent b1b9edc
commit a101ca0
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/Window.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/Window.xaml
@@ -62,7 +62,7 @@
         <Setter Property="Foreground" Value="{DynamicResource SystemControlPageTextBaseHighBrush}" />
         <Setter Property="Background" Value="{DynamicResource ApplicationPageBackgroundThemeBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource WindowBorder}" />
-        <Setter Property="BorderThickness" Value="0.5" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
         <Setter Property="UseLayoutRounding" Value="True" />
@@ -81,8 +81,6 @@
                         x:Name="LayoutRoot"
                         Padding="{TemplateBinding Padding}"
                         Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
                         SnapsToDevicePixels="True">
                         <Grid>
@@ -104,13 +102,18 @@
                                     </Rectangle.Fill>-->
                                 </Rectangle>
                             </Grid>
-                            <Grid x:Name="ContentGrid">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
 
-                                <primitives:TitleBarControl
+                            <Border x:Name="WindowBorder"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}">
+                                <Grid x:Name="ContentGrid">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition />
+                                    </Grid.RowDefinitions>
+
+                                    <primitives:TitleBarControl
                                     Title="{TemplateBinding Title}"
                                     Panel.ZIndex="1"
                                     Height="{TemplateBinding primitives:TitleBar.Height}"
@@ -136,19 +139,21 @@
                                     ButtonGlyphStyle="{TemplateBinding primitives:TitleBar.ButtonGlyphStyle}"
                                     Style="{TemplateBinding primitives:TitleBar.Style}" />
 
-                                <AdornerDecorator x:Name="AdornerDecorator" Grid.Row="1">
-                                    <local:ContentPresenterEx Foreground="{TemplateBinding Foreground}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                                </AdornerDecorator>
+                                    <AdornerDecorator x:Name="AdornerDecorator" Grid.Row="1">
+                                        <local:ContentPresenterEx Foreground="{TemplateBinding Foreground}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                    </AdornerDecorator>
 
-                                <ResizeGrip
+                                    <ResizeGrip
                                     x:Name="WindowResizeGrip"
                                     Grid.Row="1"
                                     HorizontalAlignment="Right"
                                     VerticalAlignment="Bottom"
                                     IsTabStop="false"
                                     Visibility="Collapsed"
                                     WindowChrome.ResizeGripDirection="BottomRight" />
-                            </Grid>
+                                </Grid>
+
+                            </Border>
 
                             <Border
                                 x:Name="HighContrastBorder"