Update UI elements in MainWindow and Styles

- Set background for main Grid in MainWindow.xaml for both UnoApp and WinUIApp.
- Modify VisualState setters to use Indicator.Background instead of ContentPresenter.Background.
- Add a new Separator Border for improved layout.
- Simplify layout by removing unnecessary Grid structure around ContentPresenter.

Author: qian-o

src/Examples/UnoApp/MainWindow.xaml

@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:dock="using:WinUI.Dock"
         x:Name="Main">
-    <Grid>
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />

src/Examples/WinUIApp/MainWindow.xaml

@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:dock="using:WinUI.Dock"
         x:Name="Main">
-    <Grid>
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />

src/WinUI.Dock/Themes/Styles.xaml

@@ -93,29 +93,30 @@
                                 <VisualState x:Name="Normal" />
                                 <VisualState x:Name="PointerOver">
                                     <VisualState.Setters>
-                                        <Setter Target="ContentPresenter.Background" Value="{ThemeResource TabViewItemHeaderBackgroundPointerOver}" />
+                                        <Setter Target="Indicator.Opacity" Value="1" />
+                                        <Setter Target="Indicator.Background" Value="{ThemeResource TabViewItemHeaderBackgroundPointerOver}" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="Pressed" />
                                 <VisualState x:Name="Selected">
                                     <VisualState.Setters>
                                         <Setter Target="BottomLine.Opacity" Value="0" />
                                         <Setter Target="Indicator.Opacity" Value="1" />
-                                        <Setter Target="ContentPresenter.Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+                                        <Setter Target="Indicator.Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="PointerOverSelected">
                                     <VisualState.Setters>
                                         <Setter Target="BottomLine.Opacity" Value="0" />
                                         <Setter Target="Indicator.Opacity" Value="1" />
-                                        <Setter Target="ContentPresenter.Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+                                        <Setter Target="Indicator.Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="PressedSelected">
                                     <VisualState.Setters>
                                         <Setter Target="BottomLine.Opacity" Value="0" />
                                         <Setter Target="Indicator.Opacity" Value="1" />
-                                        <Setter Target="ContentPresenter.Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+                                        <Setter Target="Indicator.Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
                             </VisualStateGroup>
@@ -127,6 +128,20 @@
                                 VerticalAlignment="Bottom"
                                 Background="{TemplateBinding BorderBrush}" />
 
+                        <Border x:Name="Separator"
+                                Grid.Column="1"
+                                Width="1"
+                                Margin="{ThemeResource TabViewItemSeparatorMargin}"
+                                HorizontalAlignment="Right"
+                                Background="{ThemeResource TabViewItemSeparator}" />
+
+                        <Border x:Name="Indicator"
+                                Grid.Column="1"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="1,1,1,0"
+                                CornerRadius="4,4,0,0"
+                                Opacity="0" />
+
                         <ContentPresenter x:Name="ContentPresenter"
                                           Grid.Column="1"
                                           Padding="8,2,8,2"
@@ -139,21 +154,6 @@
                                           FontSize="{ThemeResource TabViewItemHeaderFontSize}"
                                           FontWeight="{TemplateBinding FontWeight}"
                                           Foreground="{ThemeResource TabViewItemHeaderForeground}" />
-
-                        <Grid Grid.Column="1"
-                              IsHitTestVisible="False">
-                            <Border x:Name="Separator"
-                                    Width="1"
-                                    Margin="{ThemeResource TabViewItemSeparatorMargin}"
-                                    HorizontalAlignment="Right"
-                                    Background="{ThemeResource TabViewItemSeparator}" />
-
-                            <Border x:Name="Indicator"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="1,1,1,0"
-                                    CornerRadius="4,4,0,0"
-                                    Opacity="0" />
-                        </Grid>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>

src/WinUI.Dock/WinUI.Dock.csproj

@@ -12,7 +12,7 @@
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
         <Title>$(AssemblyName)</Title>
-        <Version>1.3.0</Version>
+        <Version>1.3.1</Version>
         <Authors>qian-o</Authors>
         <Copyright>MIT</Copyright>
         <PackageReadmeFile>README.md</PackageReadmeFile>