chore: bump version to 12.0.0.

* feat: update DrawerPage and related resources for improved layout and functionality

* feat: enable mouse swipe gesture for Drawer control.

* chore: remove useless resources.

* chore: remove useless Style.

* chore: using TemplateBinding.

* fix: using InnerPathIcon theme for Icon.

* fix: use normal Binding.

---------

Co-authored-by: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>

demo/Directory.Packages.props

@@ -1,9 +1,9 @@
 <Project>
     <PropertyGroup>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <AvaloniaVersion>12.0.0-rc1</AvaloniaVersion>
+        <AvaloniaVersion>12.0.0</AvaloniaVersion>
-        <DataGridVersion>12.0.0-rc1</DataGridVersion>
+        <DataGridVersion>12.0.0</DataGridVersion>
-        <SkiaSharpVersion>3.119.1</SkiaSharpVersion>
+        <SkiaSharpVersion>3.119.3-preview.1.1</SkiaSharpVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)"/>
@@ -19,8 +19,8 @@
         <PackageVersion Include="SkiaSharp" Version="$(SkiaSharpVersion)"/>
         <PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="$(SkiaSharpVersion)"/>
 
-        <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0"/>
+        <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0.2"/>
 
-        <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
+        <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2"/>
     </ItemGroup>
 </Project>

demo/Semi.Avalonia.Demo/Pages/CommandBarDemo.axaml

@@ -58,18 +58,18 @@
                     IsOpen="{Binding #isop.IsChecked}"
                     IsSticky="{Binding #isst.IsChecked}"
                     Width="{Binding #ws.Value}">
-                    <AppBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
+                    <CommandBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
-                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
+                    <CommandBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
-                    <AppBarSeparator />
+                    <CommandBarSeparator />
-                    <AppBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
+                    <CommandBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
-                    <AppBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
+                    <CommandBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
-                    <AppBarToggleButton IsChecked="True" IsEnabled="False" Label="Underline" Icon="{DynamicResource SemiIconUnderline}" />
+                    <CommandBarToggleButton IsChecked="True" IsEnabled="False" Label="Underline" Icon="{DynamicResource SemiIconUnderline}" />
-                    <AppBarSeparator />
+                    <CommandBarSeparator />
-                    <AppBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
+                    <CommandBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
-                    <AppBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
+                    <CommandBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
-                    <AppBarButton Label="Print" Icon="{DynamicResource SemiIconPrint}" />
+                    <CommandBarButton Label="Print" Icon="{DynamicResource SemiIconPrint}" />
-                    <AppBarSeparator />
+                    <CommandBarSeparator />
-                    <AppBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
+                    <CommandBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
                 </CommandBar>
             </GroupBox>
 
@@ -79,12 +79,12 @@
                     <TextBlock Text="CommandBar — With Secondary Commands (overflow)" />
                 </GroupBox.Header>
                 <CommandBar>
-                    <AppBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
+                    <CommandBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
-                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
+                    <CommandBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
-                    <AppBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
+                    <CommandBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
                     <CommandBar.SecondaryCommands>
-                        <AppBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
+                        <CommandBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
-                        <AppBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
+                        <CommandBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
                     </CommandBar.SecondaryCommands>
                 </CommandBar>
             </GroupBox>

demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml

@@ -24,6 +24,13 @@
                           IsChecked="True"
                           IsCheckedChanged="OnGestureChanged" />
                 
+                <ComboBox SelectionChanged="OnLayoutChanged" >
+                    <ComboBoxItem Content="CompactOverlay" />
+                    <ComboBoxItem Content="CompactInline" />
+                    <ComboBoxItem Content="Split" />
+                    <ComboBoxItem Content="Overlay" />
+                </ComboBox>
+
                 <Separator />
 
                 <TextBlock Text="Status" FontWeight="SemiBold" FontSize="14" />
@@ -36,37 +43,35 @@
 
         <Border DockPanel.Dock="Right" Width="1" Background="{DynamicResource SemiColorBackground0}" />
         
-        <Border Margin="12"
+        <DrawerPage Name="DemoDrawer"
-                BorderBrush="{DynamicResource SemiColorBorder}"
+                    Margin="12"
-                BorderThickness="1"
+                    Header="First Look"
-                CornerRadius="6"
+                    DrawerLayoutBehavior="Overlay"
-                ClipToBounds="True">
+                    CompactDrawerLength="80"
-            <DrawerPage Name="DemoDrawer"
+                    DrawerLength="250">
-                        Header="First Look"
+            <DrawerPage.DrawerHeader>
-                        DrawerLength="250">
+                <TextBlock Text="Menu" Margin="16" FontSize="18" FontWeight="SemiBold" Foreground="{DynamicResource SemiColorPrimary}" />
-                <DrawerPage.DrawerHeader>
+            </DrawerPage.DrawerHeader>
-                    <Border Padding="16" Background="{DynamicResource SemiColorPrimary}">
+            <DrawerPage.DrawerFooter>
-                        <TextBlock Text="Menu" FontSize="18" FontWeight="SemiBold" Foreground="{DynamicResource SemiColorText0}" />
+                <TextBlock HorizontalAlignment="Center" Text="Powered by IRIHI" Margin="8" />
-                    </Border>
+            </DrawerPage.DrawerFooter>
-                </DrawerPage.DrawerHeader>
+            <DrawerPage.Drawer>
-                <DrawerPage.Drawer>
+                <ListBox Name="DrawerMenu" SelectionChanged="OnMenuSelectionChanged">
-                    <ListBox Name="DrawerMenu" SelectionChanged="OnMenuSelectionChanged">
+                    <ListBoxItem Content="Home" />
-                        <ListBoxItem Content="Home" />
+                    <ListBoxItem Content="Settings" />
-                        <ListBoxItem Content="Settings" />
+                    <ListBoxItem Content="Profile" />
-                        <ListBoxItem Content="Profile" />
+                    <ListBoxItem Content="About" />
-                        <ListBoxItem Content="About" />
+                </ListBox>
-                    </ListBox>
+            </DrawerPage.Drawer>
-                </DrawerPage.Drawer>
+            <DrawerPage.Content>
-                <DrawerPage.Content>
+                <ContentPage Header="Home">
-                    <ContentPage Header="Home">
+                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
-                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
+                        <TextBlock Text="Home Page" FontSize="20" FontWeight="SemiBold" HorizontalAlignment="Center" />
-                            <TextBlock Text="Home Page" FontSize="20" FontWeight="SemiBold" HorizontalAlignment="Center" />
+                        <TextBlock Text="Swipe from the left edge or use the hamburger button to open the drawer."
-                            <TextBlock Text="Swipe from the left edge or use the hamburger button to open the drawer."
+                                   FontSize="13" Opacity="0.7" TextWrapping="Wrap" TextAlignment="Center" MaxWidth="300" />
-                                       FontSize="13" Opacity="0.7" TextWrapping="Wrap" TextAlignment="Center" MaxWidth="300" />
+                    </StackPanel>
-                        </StackPanel>
+                </ContentPage>
-                    </ContentPage>
+            </DrawerPage.Content>
-                </DrawerPage.Content>
+        </DrawerPage>
-            </DrawerPage>
-        </Border>
     </DockPanel>
 </UserControl>

demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml.cs

@@ -1,8 +1,9 @@
 using System;
+using System.Linq;
 using Avalonia.Controls;
+using Avalonia.Input.GestureRecognizers;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
-using Avalonia.Media;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -11,6 +12,7 @@ public partial class DrawerPageDemo : UserControl
     public DrawerPageDemo()
     {
         InitializeComponent();
+        EnableMouseSwipeGesture(DemoDrawer);
     }
 
     protected override void OnLoaded(RoutedEventArgs e)
@@ -52,7 +54,6 @@ public partial class DrawerPageDemo : UserControl
                     FontSize = 16,
                     HorizontalAlignment = HorizontalAlignment.Center,
                     VerticalAlignment = VerticalAlignment.Center,
-                    Foreground = Brushes.Black,
                 },
                 HorizontalContentAlignment = HorizontalAlignment.Stretch,
                 VerticalContentAlignment = VerticalAlignment.Stretch
@@ -65,4 +66,25 @@ public partial class DrawerPageDemo : UserControl
     {
         StatusText.Text = $"Drawer: {(DemoDrawer.IsOpen ? "Open" : "Closed")}";
     }
+
+    private static void EnableMouseSwipeGesture(Control control)
+    {
+        var recognizer = control.GestureRecognizers
+            .OfType<SwipeGestureRecognizer>()
+            .FirstOrDefault();
+
+        recognizer?.IsMouseEnabled = true;
+    }
+
+    private void OnLayoutChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        DemoDrawer.DrawerLayoutBehavior = (sender as ComboBox)?.SelectedIndex switch
+        {
+            0 => DrawerLayoutBehavior.CompactOverlay,
+            1 => DrawerLayoutBehavior.CompactInline,
+            2 => DrawerLayoutBehavior.Split,
+            3 => DrawerLayoutBehavior.Overlay,
+            _ => DrawerLayoutBehavior.CompactOverlay
+        };
+    }
 }

demo/Semi.Avalonia.Demo/Pages/NavigationPageDemo.axaml

@@ -48,6 +48,7 @@
                                Text="Current: Home"
                                Opacity="0.7"
                                TextWrapping="Wrap" />
+                    <ToggleSwitch Content="Large" Name="large" />
                 </StackPanel>
             </ScrollViewer>
 
@@ -58,7 +59,9 @@
                     BorderThickness="1"
                     CornerRadius="6"
                     ClipToBounds="True">
-                <NavigationPage Name="DemoNav" />
+                <NavigationPage 
+                    Name="DemoNav" 
+                    Classes.Large="{Binding #large.IsChecked}" />
             </Border>
         </DockPanel>
     </ScrollViewer>

src/Directory.Packages.props

@@ -1,14 +1,14 @@
 <Project>
     <PropertyGroup>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <AvaloniaVersion>12.0.0-rc1</AvaloniaVersion>
+        <AvaloniaVersion>12.0.0</AvaloniaVersion>
-        <DataGridVersion>12.0.0-rc1</DataGridVersion>
+        <DataGridVersion>12.0.0</DataGridVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)"/>
         <PackageVersion Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
         <PackageVersion Include="Avalonia.Controls.DataGrid" Version="$(DataGridVersion)"/>
         <PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.1.1"/>
-        <PackageVersion Include="Irihi.Avalonia.Shared" Version="0.4.0-rc1"/>
+        <PackageVersion Include="Irihi.Avalonia.Shared" Version="0.4.0"/>
     </ItemGroup>
 </Project>

src/Semi.Avalonia/Controls/CarouselPage.axaml

@@ -4,7 +4,7 @@
     <ControlTheme x:Key="{x:Type CarouselPage}" TargetType="CarouselPage">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Template">
-            <ControlTemplate>
+            <ControlTemplate TargetType="CarouselPage">
                 <Carousel
                     Name="PART_Carousel"
                     Background="{TemplateBinding Background}"

src/Semi.Avalonia/Controls/CommandBar.axaml

@@ -28,24 +28,24 @@
                     DefaultLabelPosition="{Binding #lc.SelectedValue}"
                     IsDynamicOverflowEnabled="{Binding #idfe.IsChecked}"
                     Width="{Binding #ws.Value}">
-                    <AppBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
+                    <CommandBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
-                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
+                    <CommandBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
-                    <AppBarSeparator />
+                    <CommandBarSeparator />
-                    <AppBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
+                    <CommandBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
-                    <AppBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
+                    <CommandBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
-                    <AppBarToggleButton IsEnabled="False" IsChecked="True" Label="Underline" Icon="{DynamicResource SemiIconUnderline}" />
+                    <CommandBarToggleButton IsEnabled="False" IsChecked="True" Label="Underline" Icon="{DynamicResource SemiIconUnderline}" />
-                    <AppBarSeparator />
+                    <CommandBarSeparator />
-                    <AppBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
+                    <CommandBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
-                    <AppBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
+                    <CommandBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
-                    <AppBarButton Label="Print" Icon="{DynamicResource SemiIconPrint}" />
+                    <CommandBarButton Label="Print" Icon="{DynamicResource SemiIconPrint}" />
-                    <AppBarSeparator />
+                    <CommandBarSeparator />
-                    <AppBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
+                    <CommandBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
                 </CommandBar>
             </StackPanel>
         </GroupBox>
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="AppBarButtonBaseTheme" TargetType="Button">
+    <ControlTheme x:Key="CommandBarButtonBaseTheme" TargetType="Button">
         <Setter Property="Template">
             <ControlTemplate TargetType="Button">
                 <Border
@@ -57,7 +57,7 @@
                     Padding="{TemplateBinding Padding}">
                     <StackPanel
                         Name="PART_LayoutRoot"
-                        Spacing="{DynamicResource AppBarButtonPanelSpacing}"
+                        Spacing="{DynamicResource CommandBarButtonPanelSpacing}"
                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                         <ContentPresenter
@@ -73,50 +73,51 @@
                         </ContentPresenter>
                         <TextBlock
                             Name="PART_Label"
+                            MaxLines="1"
                             Foreground="{TemplateBinding Foreground}"
-                            FontSize="{DynamicResource AppBarButtonLabelFontSize}"
+                            FontSize="{DynamicResource CommandBarButtonLabelFontSize}"
                             TextTrimming="CharacterEllipsis" />
                     </StackPanel>
                 </Border>
             </ControlTemplate>
         </Setter>
 
-        <Setter Property="Background" Value="{DynamicResource AppBarButtonBackground}" />
+        <Setter Property="Background" Value="{DynamicResource CommandBarButtonBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource AppBarButtonForeground}" />
+        <Setter Property="Foreground" Value="{DynamicResource CommandBarButtonForeground}" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Padding" Value="{DynamicResource AppBarButtonPadding}" />
+        <Setter Property="Padding" Value="{DynamicResource CommandBarButtonPadding}" />
-        <Setter Property="Width" Value="{DynamicResource AppBarButtonWidth}" />
+        <Setter Property="Width" Value="{DynamicResource CommandBarButtonWidth}" />
-        <Setter Property="MinHeight" Value="{DynamicResource AppBarButtonMinHeight}" />
+        <Setter Property="MinHeight" Value="{DynamicResource CommandBarButtonMinHeight}" />
 
-        <Setter Property="CornerRadius" Value="{DynamicResource AppBarButtonCornerRadius}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource CommandBarButtonCornerRadius}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Cursor" Value="Hand" />
 
         <Style Selector="^:pointerover /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource AppBarButtonPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CommandBarButtonPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource AppBarButtonPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CommandBarButtonPressedBackground}" />
         </Style>
 
         <Style Selector="^:disabled">
             <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource AppBarButtonDisabledForeground}" />
+                <Setter Property="Foreground" Value="{DynamicResource CommandBarButtonDisabledForeground}" />
             </Style>
             <Style Selector="^ /template/ TextBlock#PART_Label">
-                <Setter Property="Foreground" Value="{DynamicResource AppBarButtonDisabledForeground}" />
+                <Setter Property="Foreground" Value="{DynamicResource CommandBarButtonDisabledForeground}" />
             </Style>
         </Style>
     </ControlTheme>
 
-    <!--  AppBarButton  -->
+    <!--  CommandBarButton  -->
     <ControlTheme
-        x:Key="{x:Type AppBarButton}"
+        x:Key="{x:Type CommandBarButton}"
-        BasedOn="{StaticResource AppBarButtonBaseTheme}"
+        BasedOn="{StaticResource CommandBarButtonBaseTheme}"
-        TargetType="AppBarButton">
+        TargetType="CommandBarButton">
 
         <Style Selector="^ /template/ TextBlock#PART_Label">
             <Setter Property="Text" Value="{TemplateBinding Label}" />
@@ -127,7 +128,7 @@
 
         <!--  IsCompact: hide label, use compact width  -->
         <Style Selector="^[IsCompact=True]">
-            <Setter Property="Width" Value="{DynamicResource AppBarButtonCompactWidth}" />
+            <Setter Property="Width" Value="{DynamicResource CommandBarButtonCompactWidth}" />
             <Style Selector="^ /template/ TextBlock#PART_Label">
                 <Setter Property="IsVisible" Value="False" />
             </Style>
@@ -135,7 +136,7 @@
 
         <!--  LabelPosition=Collapsed: hide label, use compact width  -->
         <Style Selector="^[LabelPosition=Collapsed]">
-            <Setter Property="Width" Value="{DynamicResource AppBarButtonCompactWidth}" />
+            <Setter Property="Width" Value="{DynamicResource CommandBarButtonCompactWidth}" />
             <Style Selector="^ /template/ TextBlock#PART_Label">
                 <Setter Property="IsVisible" Value="False" />
             </Style>
@@ -144,7 +145,7 @@
         <!--  LabelPosition=Right: horizontal layout, auto-width  -->
         <Style Selector="^[LabelPosition=Right]">
             <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
-            <Setter Property="MinWidth" Value="{DynamicResource AppBarButtonCompactWidth}" />
+            <Setter Property="MinWidth" Value="{DynamicResource CommandBarButtonCompactWidth}" />
             <Style Selector="^ /template/ StackPanel#PART_LayoutRoot">
                 <Setter Property="Orientation" Value="Horizontal" />
             </Style>
@@ -160,8 +161,8 @@
         <Style Selector="^[IsInOverflow=True]">
             <Setter Property="HorizontalContentAlignment" Value="Left" />
             <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
-            <Setter Property="MinHeight" Value="{DynamicResource AppBarButtonOverflowMinHeight}" />
+            <Setter Property="MinHeight" Value="{DynamicResource CommandBarButtonOverflowMinHeight}" />
-            <Setter Property="Padding" Value="{DynamicResource AppBarButtonOverflowPadding}" />
+            <Setter Property="Padding" Value="{DynamicResource CommandBarButtonOverflowPadding}" />
             <Style Selector="^ /template/ StackPanel#PART_LayoutRoot">
                 <Setter Property="Orientation" Value="Horizontal" />
             </Style>
@@ -174,11 +175,11 @@
         </Style>
     </ControlTheme>
 
-    <!--  AppBarToggleButton  -->
+    <!--  CommandBarToggleButton  -->
     <ControlTheme
-        x:Key="{x:Type AppBarToggleButton}"
+        x:Key="{x:Type CommandBarToggleButton}"
-        BasedOn="{StaticResource AppBarButtonBaseTheme}"
+        BasedOn="{StaticResource CommandBarButtonBaseTheme}"
-        TargetType="AppBarToggleButton">
+        TargetType="CommandBarToggleButton">
 
         <Style Selector="^ /template/ TextBlock#PART_Label">
             <Setter Property="Text" Value="{TemplateBinding Label}" />
@@ -189,25 +190,25 @@
 
         <Style Selector="^:checked">
             <Style Selector="^ /template/ Border#PART_Border">
-                <Setter Property="Background" Value="{DynamicResource AppBarToggleButtonCheckedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CommandBarToggleButtonCheckedBackground}" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource AppBarToggleButtonCheckedForeground}" />
+                <Setter Property="Foreground" Value="{DynamicResource CommandBarToggleButtonCheckedForeground}" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#PART_Border">
-                <Setter Property="Background" Value="{DynamicResource AppBarToggleButtonCheckedPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CommandBarToggleButtonCheckedPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed /template/ Border#PART_Border">
-                <Setter Property="Background" Value="{DynamicResource AppBarToggleButtonCheckedPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CommandBarToggleButtonCheckedPressedBackground}" />
             </Style>
             <Style Selector="^:disabled /template/ ContentPresenter#PART_IconPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource AppBarToggleButtonCheckedDisabledForeground}" />
+                <Setter Property="Foreground" Value="{DynamicResource CommandBarToggleButtonCheckedDisabledForeground}" />
             </Style>
         </Style>
 
         <!--  IsCompact: hide label, use compact width  -->
         <Style Selector="^[IsCompact=True]">
-            <Setter Property="Width" Value="{DynamicResource AppBarButtonCompactWidth}" />
+            <Setter Property="Width" Value="{DynamicResource CommandBarButtonCompactWidth}" />
             <Style Selector="^ /template/ TextBlock#PART_Label">
                 <Setter Property="IsVisible" Value="False" />
             </Style>
@@ -215,7 +216,7 @@
 
         <!--  LabelPosition=Collapsed: hide label, use compact width  -->
         <Style Selector="^[LabelPosition=Collapsed]">
-            <Setter Property="Width" Value="{DynamicResource AppBarButtonCompactWidth}" />
+            <Setter Property="Width" Value="{DynamicResource CommandBarButtonCompactWidth}" />
             <Style Selector="^ /template/ TextBlock#PART_Label">
                 <Setter Property="IsVisible" Value="False" />
             </Style>
@@ -224,7 +225,7 @@
         <!--  LabelPosition=Right: horizontal layout, auto-width  -->
         <Style Selector="^[LabelPosition=Right]">
             <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
-            <Setter Property="MinWidth" Value="{DynamicResource AppBarButtonCompactWidth}" />
+            <Setter Property="MinWidth" Value="{DynamicResource CommandBarButtonCompactWidth}" />
             <Style Selector="^ /template/ StackPanel#PART_LayoutRoot">
                 <Setter Property="Orientation" Value="Horizontal" />
             </Style>
@@ -240,8 +241,8 @@
         <Style Selector="^[IsInOverflow=True]">
             <Setter Property="HorizontalContentAlignment" Value="Left" />
             <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
-            <Setter Property="MinHeight" Value="{DynamicResource AppBarButtonOverflowMinHeight}" />
+            <Setter Property="MinHeight" Value="{DynamicResource CommandBarButtonOverflowMinHeight}" />
-            <Setter Property="Padding" Value="{DynamicResource AppBarButtonOverflowPadding}" />
+            <Setter Property="Padding" Value="{DynamicResource CommandBarButtonOverflowPadding}" />
             <Style Selector="^ /template/ StackPanel#PART_LayoutRoot">
                 <Setter Property="Orientation" Value="Horizontal" />
             </Style>
@@ -254,14 +255,14 @@
         </Style>
     </ControlTheme>
 
-    <!--  AppBarSeparator  -->
+    <!--  CommandBarSeparator  -->
-    <ControlTheme x:Key="{x:Type AppBarSeparator}" TargetType="AppBarSeparator">
+    <ControlTheme x:Key="{x:Type CommandBarSeparator}" TargetType="CommandBarSeparator">
-        <Setter Property="Background" Value="{DynamicResource AppBarSeparatorBackground}" />
+        <Setter Property="Background" Value="{DynamicResource CommandBarSeparatorBackground}" />
-        <Setter Property="Width" Value="{DynamicResource AppBarSeparatorWidth}" />
+        <Setter Property="Width" Value="{DynamicResource CommandBarSeparatorWidth}" />
-        <Setter Property="MinHeight" Value="{DynamicResource AppBarSeparatorMinHeight}" />
+        <Setter Property="MinHeight" Value="{DynamicResource CommandBarSeparatorMinHeight}" />
-        <Setter Property="Margin" Value="{DynamicResource AppBarSeparatorMargin}" />
+        <Setter Property="Margin" Value="{DynamicResource CommandBarSeparatorMargin}" />
         <Setter Property="Template">
-            <ControlTemplate TargetType="AppBarSeparator">
+            <ControlTemplate TargetType="CommandBarSeparator">
                 <Border
                     Background="{TemplateBinding Background}"
                     Width="{TemplateBinding Width}"
@@ -273,9 +274,9 @@
         <Style Selector="^[IsInOverflow=True]">
             <Setter Property="HorizontalAlignment" Value="Stretch" />
             <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
-            <Setter Property="Height" Value="{DynamicResource AppBarSeparatorOverflowHeight}" />
+            <Setter Property="Height" Value="{DynamicResource CommandBarSeparatorOverflowHeight}" />
             <Setter Property="MinHeight" Value="0" />
-            <Setter Property="Margin" Value="{DynamicResource AppBarSeparatorOverflowMargin}" />
+            <Setter Property="Margin" Value="{DynamicResource CommandBarSeparatorOverflowMargin}" />
         </Style>
     </ControlTheme>
 
@@ -299,9 +300,9 @@
                     MinHeight="{TemplateBinding MinHeight}"
                     Padding="{TemplateBinding Padding}">
                     <Panel>
-                        <DockPanel>
+                        <DockPanel KeyboardNavigation.TabNavigation="Cycle">
                             <!--  Overflow button (docked right)  -->
-                            <AppBarButton
+                            <CommandBarButton
                                 Name="PART_OverflowButton"
                                 DockPanel.Dock="Right"
                                 Icon="{DynamicResource CommandBarOverflowButtonGlyph}"
@@ -351,6 +352,7 @@
                                 CornerRadius="{DynamicResource CommandBarOverflowCornerRadius}">
 
                                 <ItemsControl
+                                    Name="PART_OverflowPresenter"
                                     ItemsSource="{Binding OverflowItems, RelativeSource={RelativeSource TemplatedParent}}">
                                     <ItemsControl.ItemsPanel>
                                         <ItemsPanelTemplate>

src/Semi.Avalonia/Controls/ContentPage.axaml

@@ -16,27 +16,26 @@
     <ControlTheme x:Key="{x:Type ContentPage}" TargetType="ContentPage">
         <Setter Property="Background" Value="{DynamicResource ContentPageBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource ContentPageForeground}" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="Template">
             <ControlTemplate TargetType="ContentPage">
-                <Grid RowDefinitions="Auto,*,Auto" Background="{TemplateBinding Background}">
+                <DockPanel>
                     <ContentPresenter
                         Name="PART_TopCommandBar"
-                        Grid.Row="0"
+                        DockPanel.Dock="Top" />
-                        Content="{TemplateBinding TopCommandBar}" />
-                    <ContentPresenter
-                        Name="PART_ContentPresenter"
-                        Grid.Row="1"
-                        Content="{TemplateBinding Content}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
                     <ContentPresenter
                         Name="PART_BottomCommandBar"
-                        Grid.Row="2"
+                        DockPanel.Dock="Bottom" />
-                        Content="{TemplateBinding BottomCommandBar}" />
+                    <ContentPresenter
-                </Grid>
+                        Name="PART_ContentPresenter"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Content="{TemplateBinding Content}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}" />
+                </DockPanel>
             </ControlTemplate>
         </Setter>
     </ControlTheme>

src/Semi.Avalonia/Controls/DrawerPage.axaml

@@ -1,6 +1,4 @@
-<ResourceDictionary
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.PreviewWith>
         <DrawerPage Width="400" Height="300" />
     </Design.PreviewWith>
@@ -8,140 +6,247 @@
     <ControlTheme x:Key="{x:Type DrawerPage}" TargetType="DrawerPage">
         <Setter Property="Background" Value="{DynamicResource DrawerPageBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource DrawerPageForeground}" />
-        <Setter Property="DrawerBackground" Value="{DynamicResource DrawerPageDrawerBackground}" />
-        <Setter Property="DrawerLength" Value="{DynamicResource DrawerPageDrawerLength}" />
-        <Setter Property="CompactDrawerLength" Value="{DynamicResource DrawerPageCompactDrawerLength}" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="Template">
             <ControlTemplate TargetType="DrawerPage">
-                <Grid RowDefinitions="Auto,*" Background="{TemplateBinding Background}">
+                <SplitView
-
+                    Name="PART_SplitView"
-                    <!--  Top bar with pane toggle button  -->
+                    CompactPaneLength="{TemplateBinding CompactDrawerLength}"
-                    <Border
+                    DisplayMode="{TemplateBinding DisplayMode}"
-                        Name="PART_TopBar"
+                    IsPaneOpen="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                        Grid.Row="0"
+                    OpenPaneLength="{TemplateBinding DrawerLength}"
-                        MinHeight="{DynamicResource DrawerPageTopBarMinHeight}"
+                    PaneBackground="{Binding DrawerBackground, RelativeSource={RelativeSource TemplatedParent}}">
-                        Padding="{DynamicResource DrawerPageTopBarPadding}"
+                    <SplitView.Pane>
-                        Background="{DynamicResource DrawerPageTopBarBackground}"
+                        <DockPanel Background="{TemplateBinding DrawerBackground}">
-                        BorderBrush="{DynamicResource DrawerPageTopBarBorderBrush}"
+                            <!--  Compact-mode toggle: visible only in CompactOverlay/CompactInline.  -->
-                        BorderThickness="{DynamicResource DrawerPageTopBarBorderThickness}">
-                        <Grid ColumnDefinitions="Auto,Auto,*">
-                            <!--  Pane toggle button (hamburger)  -->
                             <ToggleButton
-                                Name="PART_PaneButton"
+                                Name="PART_CompactPaneToggle"
-                                Grid.Column="0"
+                                Width="{DynamicResource ButtonDefaultHeight}"
-                                Width="{DynamicResource DrawerPagePaneButtonSize}"
+                                Height="{DynamicResource ButtonDefaultHeight}"
-                                Height="{DynamicResource DrawerPagePaneButtonSize}"
+                                HorizontalAlignment="Left"
-                                Margin="{DynamicResource DrawerPagePaneButtonMargin}"
+                                AutomationProperties.Name="Toggle navigation drawer"
-                                VerticalAlignment="Center"
+                                Background="Transparent"
-                                Background="{DynamicResource DrawerPagePaneButtonBackground}"
+                                DockPanel.Dock="Top"
-                                Foreground="{DynamicResource DrawerPagePaneButtonForeground}"
+                                IsChecked="{Binding #PART_SplitView.IsPaneOpen, Mode=TwoWay}"
-                                IsChecked="{TemplateBinding IsOpen, Mode=TwoWay}">
+                                IsVisible="False"
-                                <PathIcon
+                                ToolTip.Tip="Toggle navigation drawer">
-                                    Width="16"
+                                <Panel>
-                                    Height="16"
+                                    <PathIcon
-                                    Data="{DynamicResource DrawerPageMenuGlyph}"
+                                        HorizontalAlignment="Center"
-                                    Foreground="{DynamicResource DrawerPagePaneButtonForeground}" />
+                                        VerticalAlignment="Center"
-                            </ToggleButton>
+                                        Data="{DynamicResource DrawerPageMenuGlyph}"
-
+                                        Foreground="{DynamicResource DrawerPagePaneButtonForeground}"
-                            <!--  Drawer icon (shown in top bar)  -->
+                                        IsVisible="{TemplateBinding DrawerIcon, Converter={x:Static ObjectConverters.IsNull}}"
-                            <ContentPresenter
+                                        Theme="{DynamicResource InnerPathIcon}" />
-                                Name="PART_PaneIconPresenter"
-                                Grid.Column="1"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding DrawerIcon}"
-                                ContentTemplate="{TemplateBinding DrawerIconTemplate}" />
-                        </Grid>
-                    </Border>
-
-                    <!--  Main area: SplitView + Backdrop  -->
-                    <Panel Grid.Row="1">
-                        <SplitView
-                            Name="PART_SplitView"
-                            CompactPaneLength="{TemplateBinding CompactDrawerLength}"
-                            DisplayMode="{TemplateBinding DisplayMode}"
-                            IsPaneOpen="{TemplateBinding IsOpen, Mode=TwoWay}"
-                            OpenPaneLength="{TemplateBinding DrawerLength}"
-                            PaneBackground="{TemplateBinding DrawerBackground}">
-                            <SplitView.Pane>
-                                <DockPanel>
-                                    <!--  Drawer header  -->
-                                    <ContentPresenter
-                                        Name="PART_DrawerHeader"
-                                        DockPanel.Dock="Top"
-                                        Background="{TemplateBinding DrawerHeaderBackground}"
-                                        Content="{TemplateBinding DrawerHeader}" />
-
-                                    <!--  Drawer footer  -->
-                                    <ContentPresenter
-                                        Name="PART_DrawerFooter"
-                                        DockPanel.Dock="Bottom"
-                                        Background="{TemplateBinding DrawerFooterBackground}"
-                                        Content="{TemplateBinding DrawerFooter}" />
-
-                                    <!--  Compact pane icon (compact mode)  -->
                                     <ContentPresenter
                                         Name="PART_CompactPaneIconPresenter"
-                                        DockPanel.Dock="Top"
+                                        HorizontalAlignment="Center"
-                                        IsVisible="False"
+                                        VerticalAlignment="Center"
                                         Content="{TemplateBinding DrawerIcon}"
-                                        ContentTemplate="{TemplateBinding DrawerIconTemplate}" />
+                                        ContentTemplate="{TemplateBinding DrawerIconTemplate}"
-
+                                        Foreground="{DynamicResource DrawerPagePaneButtonForeground}"
-                                    <!--  Bottom pane icon  -->
+                                        IsVisible="{TemplateBinding DrawerIcon, Converter={x:Static ObjectConverters.IsNotNull}}" />
-                                    <ContentPresenter
+                                </Panel>
-                                        Name="PART_BottomPaneIconPresenter"
+                            </ToggleButton>
-                                        DockPanel.Dock="Bottom"
+                            <ContentPresenter
-                                        IsVisible="False" 
+                                Name="PART_DrawerHeader"
-                                        Content="{TemplateBinding DrawerIcon}"
+                                Background="{TemplateBinding DrawerHeaderBackground}"
-                                        ContentTemplate="{TemplateBinding DrawerIconTemplate}" />
+                                Content="{TemplateBinding DrawerHeader}"
-
+                                ContentTemplate="{TemplateBinding DrawerHeaderTemplate}"
-                                    <!--  Drawer main content  -->
+                                DockPanel.Dock="Top"
-                                    <ContentPresenter
+                                IsVisible="{TemplateBinding DrawerHeader,
-                                        Name="PART_DrawerPresenter"
+                                                            Converter={x:Static ObjectConverters.IsNotNull}}" />
-                                        Content="{TemplateBinding Drawer}"
+                            <ContentPresenter
-                                        ContentTemplate="{TemplateBinding DrawerTemplate}" />
+                                Name="PART_DrawerFooter"
+                                Background="{TemplateBinding DrawerFooterBackground}"
+                                Content="{TemplateBinding DrawerFooter}"
+                                ContentTemplate="{TemplateBinding DrawerFooterTemplate}"
+                                DockPanel.Dock="Bottom"
+                                IsVisible="{TemplateBinding DrawerFooter,
+                                                            Converter={x:Static ObjectConverters.IsNotNull}}" />
+                            <ContentPresenter
+                                Name="PART_DrawerPresenter"
+                                HorizontalContentAlignment="Stretch"
+                                VerticalContentAlignment="Stretch"
+                                Content="{TemplateBinding Drawer}"
+                                ContentTemplate="{TemplateBinding DrawerTemplate}" />
+                        </DockPanel>
+                    </SplitView.Pane>
+                    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                        <DockPanel Name="PART_ContentDock">
+                            <Border
+                                Name="PART_TopBar"
+                                Height="{DynamicResource DrawerPageTopBarMinHeight}"
+                                Padding="5"
+                                Background="{DynamicResource DrawerPageTopBarBackground}"
+                                DockPanel.Dock="Top">
+                                <DockPanel HorizontalAlignment="Stretch">
+                                    <ToggleButton
+                                        Name="PART_PaneButton"
+                                        Width="{DynamicResource ButtonDefaultHeight}"
+                                        Height="{DynamicResource ButtonDefaultHeight}"
+                                        AutomationProperties.Name="Toggle navigation drawer"
+                                        Background="Transparent"
+                                        DockPanel.Dock="Left"
+                                        IsChecked="{Binding #PART_SplitView.IsPaneOpen, Mode=TwoWay}"
+                                        ToolTip.Tip="Toggle navigation drawer">
+                                        <Panel>
+                                            <PathIcon
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Data="{DynamicResource DrawerPageMenuGlyph}"
+                                                Foreground="{DynamicResource DrawerPagePaneButtonForeground}"
+                                                IsVisible="{TemplateBinding DrawerIcon, Converter={x:Static ObjectConverters.IsNull}}"
+                                                Theme="{DynamicResource InnerPathIcon}" />
+                                            <ContentPresenter
+                                                Name="PART_PaneIconPresenter"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Content="{TemplateBinding DrawerIcon}"
+                                                ContentTemplate="{TemplateBinding DrawerIconTemplate}"
+                                                Foreground="{DynamicResource DrawerPagePaneButtonForeground}"
+                                                IsVisible="{TemplateBinding DrawerIcon, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                        </Panel>
+                                    </ToggleButton>
+                                    <ContentControl
+                                        Name="PART_TitlePresenter"
+                                        Margin="8,0,0,0"
+                                        VerticalAlignment="Center"
+                                        VerticalContentAlignment="Center"
+                                        Content="{TemplateBinding Header}"
+                                        FontSize="16"
+                                        FontWeight="SemiBold"
+                                        IsVisible="{TemplateBinding Header,
+                                                                    Converter={x:Static ObjectConverters.IsNotNull}}" />
                                 </DockPanel>
-                            </SplitView.Pane>
+                            </Border>
-
+                            <Border
-                            <!--  Main page content  -->
+                                Name="PART_BottomBar"
+                                Height="{DynamicResource DrawerPageTopBarMinHeight}"
+                                Padding="5"
+                                Background="{DynamicResource DrawerPageTopBarBackground}"
+                                DockPanel.Dock="Bottom"
+                                IsVisible="False">
+                                <DockPanel HorizontalAlignment="Stretch">
+                                    <ToggleButton
+                                        Name="PART_BottomPaneButton"
+                                        AutomationProperties.Name="Toggle navigation drawer"
+                                        Background="Transparent"
+                                        DockPanel.Dock="Left"
+                                        IsChecked="{Binding #PART_SplitView.IsPaneOpen, Mode=TwoWay}"
+                                        ToolTip.Tip="Toggle navigation drawer">
+                                        <Panel>
+                                            <PathIcon
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Data="{DynamicResource DrawerPaneButtonIcon}"
+                                                IsVisible="{TemplateBinding DrawerIcon, Converter={x:Static ObjectConverters.IsNull}}"
+                                                Theme="{DynamicResource InnerPathIcon}" />
+                                            <ContentPresenter
+                                                Name="PART_BottomPaneIconPresenter"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Content="{TemplateBinding DrawerIcon}"
+                                                ContentTemplate="{TemplateBinding DrawerIconTemplate}"
+                                                IsVisible="{TemplateBinding DrawerIcon, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                        </Panel>
+                                    </ToggleButton>
+                                    <ContentControl
+                                        Name="PART_BottomTitlePresenter"
+                                        Margin="8,0,0,0"
+                                        VerticalAlignment="Center"
+                                        VerticalContentAlignment="Center"
+                                        Content="{TemplateBinding Header}"
+                                        FontSize="16"
+                                        FontWeight="SemiBold"
+                                        IsVisible="{TemplateBinding Header,
+                                                                    Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                </DockPanel>
+                            </Border>
                             <ContentPresenter
                                 Name="PART_ContentPresenter"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
                                 Content="{TemplateBinding Content}"
                                 ContentTemplate="{TemplateBinding ContentTemplate}"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                CornerRadius="{TemplateBinding CornerRadius}" />
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </DockPanel>
-                        </SplitView>
-
-                        <!--  Backdrop overlay (shown in overlay/flyout modes)  -->
                         <Border
                             Name="PART_Backdrop"
                             Background="{TemplateBinding BackdropBrush}"
                             IsHitTestVisible="False"
                             IsVisible="False" />
-
+                    </Grid>
-                        <!--  Compact pane toggle  -->
+                </SplitView>
-                        <ToggleButton
-                            Name="PART_CompactPaneToggle"
-                            IsVisible="False" />
-                    </Panel>
-                </Grid>
             </ControlTemplate>
         </Setter>
 
-        <!--  Pseudo-class: right-side drawer  -->
+        <Style Selector="^:placement-right /template/ ToggleButton#PART_PaneButton">
-        <Style Selector="^:placement-right /template/ SplitView#PART_SplitView">
+            <Setter Property="DockPanel.Dock" Value="Right" />
-            <Setter Property="PanePlacement" Value="Right" />
         </Style>
 
-        <!--  Pseudo-class: top drawer  -->
+        <!--  Bottom placement: swap top bar for bottom bar  -->
-        <Style Selector="^:placement-top /template/ SplitView#PART_SplitView">
+        <Style Selector="^:placement-bottom /template/ Border#PART_TopBar">
-            <Setter Property="PanePlacement" Value="Top" />
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^:placement-bottom /template/ Border#PART_BottomBar">
+            <Setter Property="IsVisible" Value="True" />
         </Style>
 
-        <!--  Pseudo-class: bottom drawer  -->
+        <!--  Bottom placement + compact modes: pane compact strip provides toggle, hide bottom bar  -->
-        <Style Selector="^:placement-bottom /template/ SplitView#PART_SplitView">
+        <Style Selector="^:placement-bottom[DisplayMode=CompactOverlay] /template/ Border#PART_BottomBar">
-            <Setter Property="PanePlacement" Value="Bottom" />
+            <Setter Property="IsVisible" Value="False" />
         </Style>
+        <Style Selector="^:placement-bottom[DisplayMode=CompactInline] /template/ Border#PART_BottomBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <!--  Horizontal pane (Bottom/Top): compact toggle must dock Left so drawer content can fill the rest  -->
+        <Style Selector="^:placement-bottom /template/ ToggleButton#PART_CompactPaneToggle">
+            <Setter Property="DockPanel.Dock" Value="Left" />
+        </Style>
+        <Style Selector="^:placement-top /template/ ToggleButton#PART_CompactPaneToggle">
+            <Setter Property="DockPanel.Dock" Value="Left" />
+        </Style>
+
+        <Style Selector="^[DrawerBehavior=Locked] /template/ Border#PART_TopBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <Style Selector="^[DrawerBehavior=Disabled] /template/ Border#PART_TopBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <Style Selector="^:detail-is-navpage /template/ Border#PART_TopBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <Style Selector="^[DisplayMode=CompactOverlay] /template/ Border#PART_TopBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <Style Selector="^[DisplayMode=CompactOverlay] /template/ ToggleButton#PART_CompactPaneToggle">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+
+        <Style Selector="^[DisplayMode=CompactInline] /template/ Border#PART_TopBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <Style Selector="^[DisplayMode=CompactInline] /template/ ToggleButton#PART_CompactPaneToggle">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+
+        <Style Selector="^[IsInNavigationPage=True] /template/ Border#PART_TopBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <!--  NavigationPage already hosts a hamburger toggle — suppress the compact pane toggle.  -->
+        <Style Selector="^:detail-is-navpage /template/ ToggleButton#PART_CompactPaneToggle">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/HeaderedContentControl.axaml

@@ -116,5 +116,13 @@
                 </Border>
             </ControlTemplate>
         </Setter>
+
+        <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+            <Setter Property="RecognizesAccessKey" Value="True" />
+        </Style>
+
+        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="RecognizesAccessKey" Value="True" />
+        </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml

@@ -54,4 +54,17 @@
             </ControlTemplate>
         </Setter>
     </ControlTheme>
+
+    <ControlTheme
+        x:Key="HorizontalMenuFlyoutPresenter"
+        TargetType="MenuFlyoutPresenter"
+        BasedOn="{StaticResource {x:Type MenuFlyoutPresenter}}">
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="MinWidth" Value="{DynamicResource HorizontalMenuFlyoutThemeMinWidth}" />
+        <Setter Property="ItemsPanel">
+            <ItemsPanelTemplate>
+                <StackPanel Orientation="Horizontal" />
+            </ItemsPanelTemplate>
+        </Setter>
+    </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/NavigationPage.axaml

@@ -6,89 +6,118 @@
     </Design.PreviewWith>
 
     <ControlTheme x:Key="{x:Type NavigationPage}" TargetType="NavigationPage">
-        <Setter Property="Background" Value="{DynamicResource NavigationPageBackground}" />
+        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{DynamicResource NavigationPageForeground}" />
         <Setter Property="BarHeight" Value="{DynamicResource NavigationPageBarMinHeight}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="NavigationPage">
-                <Grid RowDefinitions="Auto,*,Auto" Background="{TemplateBinding Background}">
+                <Panel ClipToBounds="True">
-                    <!--  Top command bar  -->
+                    <DockPanel>
-                    <ContentPresenter
-                        Name="PART_TopCommandBar"
-                        Grid.Row="0" />
-
-                    <!--  Content host (pages + navigation bar)  -->
-                    <Panel Name="PART_ContentHost" Grid.Row="1">
-                        <!--  Previous page (back animation target)  -->
-                        <ContentPresenter Name="PART_PageBackPresenter" />
-
-                        <!--  Current page  -->
-                        <ContentPresenter Name="PART_PagePresenter" />
-
-                        <!--  Modal back page  -->
-                        <ContentPresenter Name="PART_ModalBackPresenter" />
-
-                        <!--  Modal page  -->
-                        <ContentPresenter Name="PART_ModalPresenter" />
-
-                        <!--  Navigation bar (overlaid on content by default)  -->
                         <Border
-                            Name="PART_NavigationBar"
+                            Name="PART_NavBarSpacer"
-                            MinHeight="{TemplateBinding BarHeight}"
+                            Height="{TemplateBinding EffectiveBarHeight}"
-                            Padding="{DynamicResource NavigationPageBarPadding}"
+                            IsVisible="False"
-                            VerticalAlignment="Top"
+                            DockPanel.Dock="Top" />
-                            Background="{DynamicResource NavigationPageBarBackground}"
+                        <ContentPresenter
-                            BorderBrush="{DynamicResource NavigationPageBarBorderBrush}"
+                            Name="PART_BottomCommandBar"
-                            BorderThickness="{DynamicResource NavigationPageBarBorderThickness}">
+                            DockPanel.Dock="Bottom"
-                            <Grid ColumnDefinitions="Auto,*,Auto">
+                            Background="{TemplateBinding Background}"
-                                <Button
+                            Content="{Binding CurrentPage.(NavigationPage.BottomCommandBar), RelativeSource={RelativeSource TemplatedParent}, FallbackValue={x:Null}}" />
-                                    Name="PART_BackButton"
+                        <Panel
-                                    Grid.Column="0"
+                            Name="PART_ContentHost"
-                                    MinHeight="{DynamicResource NavigationPageBarMinHeight}"
+                            Background="{TemplateBinding Background}"
-                                    MinWidth="{DynamicResource NavigationPageBarMinHeight}"
+                            ClipToBounds="True">
-                                    Padding="8"
+                            <ContentPresenter Name="PART_PageBackPresenter" />
-                                    VerticalAlignment="Center"
+                            <ContentPresenter Name="PART_PagePresenter" />
-                                    IsVisible="{TemplateBinding IsBackButtonEffectivelyVisible}"
+                        </Panel>
-                                    Background="{DynamicResource NavigationPageBackButtonBackground}"
+                    </DockPanel>
-                                    Theme="{StaticResource BorderlessButton}">
-                                    <Panel Background="Transparent">
-                                        <PathIcon
-                                            Theme="{StaticResource InnerPathIcon}"
-                                            Classes="Large"
-                                            Data="{DynamicResource NavigationPageBackButtonGlyph}"
-                                            Foreground="{DynamicResource NavigationPageBackButtonForeground}"
-                                            IsVisible="{Binding CurrentPage?.(NavigationPage.BackButtonContent), RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNull}, FallbackValue=False}" />
-                                        <ContentPresenter
-                                            Content="{Binding CurrentPage?.(NavigationPage.BackButtonContent), RelativeSource={RelativeSource TemplatedParent}, FallbackValue={x:Null}}"
-                                            IsVisible="{Binding CurrentPage?.(NavigationPage.BackButtonContent), RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}, FallbackValue=False}"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center" />
-                                    </Panel>
-                                </Button>
-                                <ContentPresenter
-                                    Grid.Column="1"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center" />
-                            </Grid>
-                        </Border>
-                    </Panel>
 
-                    <!--  Bottom command bar  -->
+                    <Border
+                        Name="PART_NavigationBar"
+                        VerticalAlignment="Top"
+                        MinHeight="{TemplateBinding EffectiveBarHeight}"
+                        Padding="{DynamicResource NavigationPageBarPadding}"
+                        Background="{DynamicResource NavigationPageBarBackground}"
+                        BorderBrush="{DynamicResource NavigationPageBarBorderBrush}"
+                        BorderThickness="{DynamicResource NavigationPageBarBorderThickness}">
+                        <Grid ColumnDefinitions="Auto,*,Auto">
+                            <Button
+                                Name="PART_BackButton"
+                                Grid.Column="0"
+                                Classes="Tertiary"
+                                Height="{TemplateBinding BarHeight}"
+                                Width="{TemplateBinding BarHeight}"
+                                Padding="8"
+                                IsVisible="{TemplateBinding IsBackButtonEffectivelyVisible}"
+                                Theme="{StaticResource BorderlessButton}">
+                                <Panel Background="Transparent">
+                                    <PathIcon
+                                        Name="PART_BackButtonDefaultIcon"
+                                        Theme="{StaticResource InnerPathIcon}"
+                                        Data="{DynamicResource NavigationPageBackButtonGlyph}" />
+                                    <ContentPresenter
+                                        Name="PART_BackButtonContentPresenter"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Center" />
+                                </Panel>
+                            </Button>
+                            <ContentPresenter
+                                Name="PART_Header"
+                                Grid.Column="1"
+                                FontWeight="SemiBold"
+                                Content="{Binding CurrentPage?.Header, RelativeSource={RelativeSource TemplatedParent}, FallbackValue={x:Null}}"
+                                ContentTemplate="{Binding CurrentPage?.HeaderTemplate, RelativeSource={RelativeSource TemplatedParent}, FallbackValue={x:Null}}"
+                                VerticalAlignment="Center"
+                                Margin="12,0" />
+                            <ContentPresenter
+                                Name="PART_TopCommandBar"
+                                Grid.Column="2"
+                                HorizontalAlignment="Right"
+                                Content="{Binding CurrentPage?.(NavigationPage.TopCommandBar), RelativeSource={RelativeSource TemplatedParent}, FallbackValue={x:Null}}" />
+                        </Grid>
+                    </Border>
+
+                    <Border
+                        Name="PART_NavBarShadow"
+                        ZIndex="1"
+                        VerticalAlignment="Top"
+                        IsVisible="False"
+                        Height="4"
+                        IsHitTestVisible="False">
+                        <Border.Background>
+                            <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
+                                <GradientStop Color="#0C000000" Offset="0" />
+                                <GradientStop Color="#00000000" Offset="1" />
+                            </LinearGradientBrush>
+                        </Border.Background>
+                    </Border>
                     <ContentPresenter
-                        Name="PART_BottomCommandBar"
+                        Name="PART_ModalBackPresenter"
-                        Grid.Row="2" />
+                        ZIndex="99"
-                </Grid>
+                        IsVisible="False"
+                        Background="{TemplateBinding Background}" />
+                    <ContentPresenter
+                        Name="PART_ModalPresenter"
+                        ZIndex="100"
+                        IsVisible="False"
+                        Background="{TemplateBinding Background}" />
+                </Panel>
             </ControlTemplate>
         </Setter>
 
-        <!--  Navigation bar is inset (content flows under the bar)  -->
+        <Style Selector="^ /template/ Border#PART_NavigationBar">
-        <Style Selector="^:nav-bar-inset /template/ Border#PART_NavigationBar">
+            <Setter Property="Background" Value="{DynamicResource NavigationBarBackground}" />
-            <Setter Property="BorderThickness" Value="0" />
         </Style>
 
-        <!--  Compact navigation bar  -->
+        <Style Selector="^:nav-bar-inset /template/ Border#PART_NavBarSpacer">
-        <Style Selector="^:nav-bar-compact /template/ Border#PART_NavigationBar">
+            <Setter Property="IsVisible" Value="True" />
-            <Setter Property="MinHeight" Value="0" />
+        </Style>
+
+        <Style Selector="^:nav-bar-compact /template/ ContentPresenter#PART_TopCommandBar CommandBar">
+            <Setter Property="DefaultLabelPosition" Value="Collapsed" />
+        </Style>
+        
+        <Style Selector="^.Large">
+            <Setter Property="BarHeight" Value="{DynamicResource NavigationPageBarLargeMinHeight}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/PipsPager.axaml

@@ -54,8 +54,8 @@
 
     <ControlTheme x:Key="{x:Type PipsPager}" TargetType="PipsPager">
         <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="PreviousButtonStyle" Value="{StaticResource PipsPagerButton}" />
+        <Setter Property="PreviousButtonTheme" Value="{StaticResource PipsPagerButton}" />
-        <Setter Property="NextButtonStyle" Value="{StaticResource PipsPagerButton}" />
+        <Setter Property="NextButtonTheme" Value="{StaticResource PipsPagerButton}" />
         <Setter Property="Template">
             <ControlTemplate>
                 <StackPanel
@@ -65,7 +65,7 @@
                     ClipToBounds="False">
                     <Button
                         Name="PART_PreviousButton"
-                        Theme="{TemplateBinding PreviousButtonStyle}"
+                        Theme="{TemplateBinding PreviousButtonTheme}"
                         IsVisible="{TemplateBinding IsPreviousButtonVisible}"
                         Foreground="{DynamicResource PipsPagerButtonForeground}"
                         Content="{StaticResource SemiIconSmallTriangleLeft}" />
@@ -89,7 +89,7 @@
 
                     <Button
                         Name="PART_NextButton"
-                        Theme="{TemplateBinding NextButtonStyle}"
+                        Theme="{TemplateBinding NextButtonTheme}"
                         Foreground="{DynamicResource PipsPagerButtonForeground}"
                         Content="{StaticResource SemiIconSmallTriangleRight}"
                         IsVisible="{TemplateBinding IsNextButtonVisible}" />

src/Semi.Avalonia/Controls/ProgressBar.axaml

@@ -4,87 +4,54 @@
     xmlns:semi="https://irihi.tech/semi"
     xmlns:converters="using:Avalonia.Controls.Converters">
     <Design.PreviewWith>
-        <StackPanel Margin="20" Spacing="20">
+        <StackPanel Width="400" Margin="20">
-            <ProgressBar
+            <ProgressBar />
-                Width="200"
+            <ProgressBar Value="20" />
-                Maximum="100"
+            <ProgressBar Value="50" Classes="Success" />
-                Minimum="0"
+            <ProgressBar Value="80" Classes="Warning" />
-                ShowProgressText="True"
+            <ProgressBar Value="100" Classes="Error" />
-                Value="20" />
+            <ProgressBar ShowProgressText="True" />
-            <ProgressBar
+            <ProgressBar Value="20" ShowProgressText="True" />
-                Width="200"
+            <ProgressBar Value="50" Classes="Success" ShowProgressText="True" />
-                IsIndeterminate="True"
+            <ProgressBar Value="80" Classes="Warning" ShowProgressText="True" />
-                Maximum="100"
+            <ProgressBar Value="100" Classes="Error" ShowProgressText="True" />
-                Minimum="0"
+            <ProgressBar Classes="Left" ShowProgressText="True" />
-                ShowProgressText="True"
+            <ProgressBar Value="20" Classes="Left" ShowProgressText="True" />
-                Value="20" />
+            <ProgressBar Value="50" Classes="Left Success" ShowProgressText="True" />
-            <ProgressBar
+            <ProgressBar Value="80" Classes="Left Warning" ShowProgressText="True" />
-                Width="200"
+            <ProgressBar Value="100" Classes="Left Error" ShowProgressText="True" />
-                Classes="Left"
+            <ProgressBar Classes="Right" ShowProgressText="True" />
-                IsIndeterminate="True"
+            <ProgressBar Value="20" Classes="Right" ShowProgressText="True" />
-                Maximum="100"
+            <ProgressBar Value="50" Classes="Right Success" ShowProgressText="True" />
-                Minimum="0"
+            <ProgressBar Value="80" Classes="Right Warning" ShowProgressText="True" />
-                ShowProgressText="True"
+            <ProgressBar Value="100" Classes="Right Error" ShowProgressText="True" />
-                Value="20" />
+
-            <ProgressBar
+            <StackPanel Orientation="Horizontal">
-                Width="200"
+                <StackPanel.Styles>
-                Classes="Left"
+                    <Style Selector="ProgressBar">
-                Maximum="100"
+                        <Setter Property="Orientation" Value="Vertical" />
-                Minimum="0"
+                    </Style>
-                ShowProgressText="True"
+                </StackPanel.Styles>
-                Value="20" />
+                <ProgressBar />
-            <ProgressBar
+                <ProgressBar Value="20" />
-                Width="200"
+                <ProgressBar Value="50" Classes="Success" />
-                Classes="Right"
+                <ProgressBar Value="80" Classes="Warning" />
-                Maximum="100"
+                <ProgressBar Value="100" Classes="Error" />
-                Minimum="0"
+                <ProgressBar ShowProgressText="True" />
-                ShowProgressText="True"
+                <ProgressBar Value="20" ShowProgressText="True" />
-                Value="20" />
+                <ProgressBar Value="50" Classes="Success" ShowProgressText="True" />
-            <StackPanel
+                <ProgressBar Value="80" Classes="Warning" ShowProgressText="True" />
-                HorizontalAlignment="Left"
+                <ProgressBar Value="100" Classes="Error" ShowProgressText="True" />
-                Orientation="Horizontal"
+                <ProgressBar Classes="Top" ShowProgressText="True" />
-                Spacing="20">
+                <ProgressBar Value="20" Classes="Top" ShowProgressText="True" />
-                <ProgressBar
+                <ProgressBar Value="50" Classes="Top Success" ShowProgressText="True" />
-                    Classes="Left"
+                <ProgressBar Value="80" Classes="Top Warning" ShowProgressText="True" />
-                    Maximum="100"
+                <ProgressBar Value="100" Classes="Top Error" ShowProgressText="True" />
-                    Minimum="0"
+                <ProgressBar Classes="Bottom" ShowProgressText="True" />
-                    Orientation="Vertical"
+                <ProgressBar Value="20" Classes="Bottom" ShowProgressText="True" />
-                    ShowProgressText="True"
+                <ProgressBar Value="50" Classes="Bottom Success" ShowProgressText="True" />
-                    Value="20" />
+                <ProgressBar Value="80" Classes="Bottom Warning" ShowProgressText="True" />
-                <ProgressBar
+                <ProgressBar Value="100" Classes="Bottom Error" ShowProgressText="True" />
-                    Classes="Right"
-                    Maximum="100"
-                    Minimum="0"
-                    Orientation="Vertical"
-                    ShowProgressText="True"
-                    Value="20" />
-                <ProgressBar
-                    Maximum="100"
-                    Minimum="0"
-                    Orientation="Vertical"
-                    ShowProgressText="True"
-                    Value="20" />
-                <ProgressBar
-                    Classes="Left"
-                    Maximum="100"
-                    Minimum="0"
-                    Orientation="Vertical"
-                    ShowProgressText="False"
-                    Value="20" />
-                <ProgressBar
-                    IsIndeterminate="True"
-                    Maximum="100"
-                    Minimum="0"
-                    Orientation="Vertical"
-                    ShowProgressText="True"
-                    Value="20" />
-                <ProgressBar
-                    IsIndeterminate="True"
-                    Maximum="100"
-                    Minimum="0"
-                    Orientation="Vertical"
-                    ShowProgressText="False"
-                    Value="20" />
             </StackPanel>
         </StackPanel>
     </Design.PreviewWith>
@@ -115,7 +82,7 @@
                             <Panel Name="DeterminateRoot" Opacity="1">
                                 <Panel.Transitions>
                                     <Transitions>
-                                        <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
+                                        <DoubleTransition Property="Opacity" Duration="0:0:0.2" />
                                     </Transitions>
                                 </Panel.Transitions>
                                 <Border
@@ -127,7 +94,7 @@
                             <Panel Name="IndeterminateRoot" Opacity="0">
                                 <Panel.Transitions>
                                     <Transitions>
-                                        <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
+                                        <DoubleTransition Property="Opacity" Duration="0:0:0.2" />
                                     </Transitions>
                                 </Panel.Transitions>
                                 <Border
@@ -158,7 +125,7 @@
                             <TextBlock.Text>
                                 <MultiBinding Converter="{StaticResource StringFormatConverter}">
                                     <TemplateBinding Property="ProgressTextFormat" />
-                                    <Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <TemplateBinding Property="Value" />
                                     <TemplateBinding Property="Percentage" />
                                     <TemplateBinding Property="Minimum" />
                                     <TemplateBinding Property="Maximum" />
@@ -187,153 +154,155 @@
         <Style Selector="^.Danger">
             <Setter Property="Foreground" Value="{DynamicResource ProgressBarDangerForeground}" />
         </Style>
-        <!-- Error style is obsolete, use Danger instead -->
+
-        <Style Selector="^.Error">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
-        </Style>
-        <Style Selector="^:horizontal /template/ Border#PART_Indicator">
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="VerticalAlignment" Value="Stretch" />
-        </Style>
-        <Style Selector="^:vertical /template/ Border#PART_Indicator">
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Top" />
-        </Style>
         <Style Selector="^:horizontal">
             <Setter Property="MinWidth" Value="200" />
             <Setter Property="MinHeight" Value="4" />
+            <Style Selector="^ /template/ Border#PART_Indicator">
+                <Setter Property="HorizontalAlignment" Value="Left" />
+            </Style>
+            <Style Selector="^ /template/ Border#IndeterminateProgressBarIndicator">
+                <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerWidth}" />
+            </Style>
+            <Style Selector="^ /template/ Border#IndeterminateProgressBarIndicator2">
+                <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2Width}" />
+            </Style>
+
+            <Style Selector="^.Left,^.Top">
+                <Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransformControl">
+                    <Setter Property="Grid.Column" Value="0" />
+                    <Setter Property="Grid.Row" Value="1" />
+                    <Setter Property="Margin" Value="0 0 16 0" />
+                    <Setter Property="MinWidth" Value="45" />
+                </Style>
+                <Style Selector="^ /template/ Border#ProgressBarRoot">
+                    <Setter Property="MinHeight" Value="4" />
+                    <Setter Property="VerticalAlignment" Value="Center" />
+                </Style>
+            </Style>
+            <Style Selector="^.Right,^.Bottom">
+                <Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransformControl">
+                    <Setter Property="Grid.Column" Value="2" />
+                    <Setter Property="Grid.Row" Value="1" />
+                    <Setter Property="Margin" Value="16 0 0 0" />
+                    <Setter Property="MinWidth" Value="45" />
+                </Style>
+                <Style Selector="^ /template/ Border#ProgressBarRoot">
+                    <Setter Property="MinHeight" Value="4" />
+                    <Setter Property="VerticalAlignment" Value="Center" />
+                </Style>
+            </Style>
         </Style>
+
         <Style Selector="^:vertical">
+            <Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransformControl">
+                <Setter Property="LayoutTransform">
+                    <RotateTransform Angle="90" />
+                </Setter>
+            </Style>
             <Setter Property="MinWidth" Value="4" />
             <Setter Property="MinHeight" Value="200" />
-        </Style>
+            <Style Selector="^ /template/ Border#PART_Indicator">
-        <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
+                <Setter Property="VerticalAlignment" Value="Top" />
-            <Setter Property="LayoutTransform">
-                <RotateTransform Angle="90" />
-            </Setter>
-        </Style>
-        <Style Selector="^:indeterminate /template/ Panel#DeterminateRoot">
-            <Setter Property="Opacity" Value="0" />
-        </Style>
-        <Style Selector="^:indeterminate /template/ Panel#IndeterminateRoot">
-            <Setter Property="Opacity" Value="1" />
-        </Style>
-        <Style Selector="^:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
-            <Style.Animations>
-                <Animation IterationCount="Infinite" Duration="0:0:2">
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
-                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationStartPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
-                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
-                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
-        </Style>
-        <Style Selector="^:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
-            <Style.Animations>
-                <Animation IterationCount="Infinite" Duration="0:0:2">
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
-                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
-                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
-                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationEndPosition}" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
-        </Style>
-        <Style Selector="^:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
-            <Style.Animations>
-                <Animation IterationCount="Infinite" Duration="0:0:2">
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
-                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationStartPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
-                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
-                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
-        </Style>
-        <Style Selector="^:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
-            <Style.Animations>
-                <Animation IterationCount="Infinite" Duration="0:0:2">
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
-                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
-                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
-                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationEndPosition}" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
-        </Style>
-        <Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator">
-            <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerWidth}" />
-        </Style>
-        <Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator2">
-            <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2Width}" />
-        </Style>
-        <Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator">
-            <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerWidth}" />
-        </Style>
-        <Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator2">
-            <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2Width}" />
-        </Style>
-        <Style Selector="^.Left">
-            <Style Selector="^:horizontal /template/ LayoutTransformControl#PART_LayoutTransformControl">
-                <Setter Property="Grid.Column" Value="0" />
-                <Setter Property="Grid.Row" Value="1" />
-                <Setter Property="Margin" Value="4 0" />
             </Style>
-            <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
+            <Style Selector="^ /template/ Border#IndeterminateProgressBarIndicator">
-                <Setter Property="Grid.Column" Value="1" />
+                <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerWidth}" />
-                <Setter Property="Grid.Row" Value="0" />
-                <Setter Property="Margin" Value="0 4" />
             </Style>
-            <Style Selector="^:horizontal /template/ Border#ProgressBarRoot">
+            <Style Selector="^ /template/ Border#IndeterminateProgressBarIndicator2">
-                <Setter Property="MinHeight" Value="4" />
+                <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2Width}" />
-                <Setter Property="VerticalAlignment" Value="Center" />
             </Style>
-            <Style Selector="^:vertical /template/ Border#ProgressBarRoot">
+            <Style Selector="^.Left,^.Top">
-                <Setter Property="MinWidth" Value="4" />
+                <Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransformControl">
-                <Setter Property="HorizontalAlignment" Value="Center" />
+                    <Setter Property="Grid.Column" Value="1" />
+                    <Setter Property="Grid.Row" Value="0" />
+                    <Setter Property="Margin" Value="0 0 0 16" />
+                    <Setter Property="MinHeight" Value="45" />
+                </Style>
+                <Style Selector="^ /template/ Border#ProgressBarRoot">
+                    <Setter Property="MinWidth" Value="4" />
+                    <Setter Property="HorizontalAlignment" Value="Center" />
+                </Style>
             </Style>
-            <Style Selector="^ /template/ TextBlock#PART_ProgressText">
+            <Style Selector="^.Right,^.Bottom">
-                <Setter Property="Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
+                <Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransformControl">
+                    <Setter Property="Grid.Column" Value="1" />
+                    <Setter Property="Grid.Row" Value="2" />
+                    <Setter Property="Margin" Value="0 16 0 0" />
+                    <Setter Property="MinHeight" Value="45" />
+                </Style>
+                <Style Selector="^ /template/ Border#ProgressBarRoot">
+                    <Setter Property="MinWidth" Value="4" />
+                    <Setter Property="HorizontalAlignment" Value="Center" />
+                </Style>
             </Style>
         </Style>
-        <Style Selector="^.Right">
+
-            <Style Selector="^:horizontal /template/ LayoutTransformControl#PART_LayoutTransformControl">
+        <Style Selector="^:indeterminate">
-                <Setter Property="Grid.Column" Value="2" />
+            <Style Selector="^ /template/ Panel#DeterminateRoot">
-                <Setter Property="Grid.Row" Value="1" />
+                <Setter Property="Opacity" Value="0" />
-                <Setter Property="Margin" Value="4 0" />
             </Style>
-            <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
+            <Style Selector="^ /template/ Panel#IndeterminateRoot">
-                <Setter Property="Grid.Column" Value="1" />
+                <Setter Property="Opacity" Value="1" />
-                <Setter Property="Grid.Row" Value="2" />
-                <Setter Property="Margin" Value="0 4" />
             </Style>
-            <Style Selector="^:horizontal /template/ Border#ProgressBarRoot">
+            <Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator">
-                <Setter Property="MinHeight" Value="4" />
+                <Style.Animations>
-                <Setter Property="VerticalAlignment" Value="Center" />
+                    <Animation IterationCount="Infinite" Duration="0:0:2">
+                        <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+                            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationStartPosition}" />
+                        </KeyFrame>
+                        <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
+                            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
+                        </KeyFrame>
+                        <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+                            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
+                        </KeyFrame>
+                    </Animation>
+                </Style.Animations>
             </Style>
-            <Style Selector="^:vertical /template/ Border#ProgressBarRoot">
+            <Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator2">
-                <Setter Property="MinWidth" Value="4" />
+                <Style.Animations>
-                <Setter Property="HorizontalAlignment" Value="Center" />
+                    <Animation IterationCount="Infinite" Duration="0:0:2">
+                        <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+                            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
+                        </KeyFrame>
+                        <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
+                            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
+                        </KeyFrame>
+                        <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+                            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationEndPosition}" />
+                        </KeyFrame>
+                    </Animation>
+                </Style.Animations>
             </Style>
-            <Style Selector="^ /template/ TextBlock#PART_ProgressText">
+            <Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator">
-                <Setter Property="Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
+                <Style.Animations>
+                    <Animation IterationCount="Infinite" Duration="0:0:2">
+                        <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+                            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationStartPosition}" />
+                        </KeyFrame>
+                        <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
+                            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
+                        </KeyFrame>
+                        <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+                            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
+                        </KeyFrame>
+                    </Animation>
+                </Style.Animations>
+            </Style>
+            <Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator2">
+                <Style.Animations>
+                    <Animation IterationCount="Infinite" Duration="0:0:2">
+                        <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+                            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
+                        </KeyFrame>
+                        <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
+                            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
+                        </KeyFrame>
+                        <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+                            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationEndPosition}" />
+                        </KeyFrame>
+                    </Animation>
+                </Style.Animations>
             </Style>
         </Style>
     </ControlTheme>
@@ -412,10 +381,6 @@
         <Style Selector="^.Danger">
             <Setter Property="Foreground" Value="{DynamicResource ProgressBarDangerForeground}" />
         </Style>
-        <!-- Error style is obsolete, use Danger instead -->
-        <Style Selector="^.Error">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
-        </Style>
         <Style Selector="^:indeterminate /template/ Arc#Indicator">
             <Setter Property="Opacity" Value="0" />
         </Style>

src/Semi.Avalonia/Controls/SplitView.axaml

@@ -493,250 +493,4 @@
             <Setter Property="IsVisible" Value="True" />
         </Style>
     </ControlTheme>
-
-    <!--  Obsolete after Avalonia 11.3.7  -->
-    <ControlTheme x:Key="VerticalSplitView" TargetType="SplitView">
-        <Setter Property="OpenPaneLength" Value="{DynamicResource SplitViewOpenPaneThemeLength}" />
-        <Setter Property="CompactPaneLength" Value="{DynamicResource SplitViewCompactPaneThemeLength}" />
-        <Setter Property="PaneBackground" Value="{DynamicResource SplitViewPaneBackground}" />
-
-        <Style Selector="^:left">
-            <Setter Property="Template">
-                <ControlTemplate TargetType="SplitView">
-                    <Grid Name="Container" Background="{TemplateBinding Background}">
-                        <Grid.RowDefinitions>
-                            <!--  why is this throwing a binding error?  -->
-                            <RowDefinition Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-
-                        <Panel
-                            Name="PART_PaneRoot"
-                            VerticalAlignment="Top"
-                            Background="{TemplateBinding PaneBackground}"
-                            ClipToBounds="True"
-                            ZIndex="100">
-                            <ContentPresenter
-                                Name="PART_PanePresenter"
-                                Content="{TemplateBinding Pane}"
-                                ContentTemplate="{TemplateBinding PaneTemplate}" />
-                            <Rectangle
-                                Name="HCPaneBorder"
-                                Height="1"
-                                VerticalAlignment="Bottom"
-                                Fill="{DynamicResource SplitViewSeparatorBackground}" />
-                        </Panel>
-
-                        <Panel Name="ContentRoot">
-                            <ContentPresenter
-                                Name="PART_ContentPresenter"
-                                Content="{TemplateBinding Content}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}" />
-                            <Rectangle
-                                Name="LightDismissLayer"
-                                Fill="Transparent"
-                                IsVisible="False" />
-                        </Panel>
-
-                    </Grid>
-                </ControlTemplate>
-            </Setter>
-
-            <Style Selector="^:overlay">
-                <Style Selector="^ /template/ Panel#PART_PaneRoot">
-                    <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-                    <Setter Property="Grid.RowSpan" Value="1" />
-                    <Setter Property="Grid.Row" Value="0" />
-                </Style>
-                <Style Selector="^ /template/ Panel#ContentRoot">
-                    <Setter Property="Grid.Row" Value="1" />
-                    <Setter Property="Grid.RowSpan" Value="2" />
-                </Style>
-            </Style>
-
-            <Style Selector="^:compactinline">
-                <Style Selector="^ /template/ Panel#PART_PaneRoot">
-                    <Setter Property="Grid.RowSpan" Value="1" />
-                    <Setter Property="Grid.Row" Value="0" />
-                    <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-                </Style>
-                <Style Selector="^ /template/ Panel#ContentRoot">
-                    <Setter Property="Grid.Row" Value="1" />
-                    <Setter Property="Grid.RowSpan" Value="1" />
-                </Style>
-            </Style>
-
-            <Style Selector="^:compactoverlay">
-                <Style Selector="^ /template/ Panel#PART_PaneRoot">
-                    <!--  RowSpan should be 2  -->
-                    <Setter Property="Grid.RowSpan" Value="1" />
-                    <Setter Property="Grid.Row" Value="0" />
-                    <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-                </Style>
-                <Style Selector="^ /template/ Panel#ContentRoot">
-                    <Setter Property="Grid.Row" Value="1" />
-                    <Setter Property="Grid.RowSpan" Value="1" />
-                </Style>
-            </Style>
-
-            <Style Selector="^:inline">
-                <Style Selector="^ /template/ Panel#PART_PaneRoot">
-                    <Setter Property="Grid.RowSpan" Value="1" />
-                    <Setter Property="Grid.Row" Value="0" />
-                    <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-                </Style>
-                <Style Selector="^ /template/ Panel#ContentRoot">
-                    <Setter Property="Grid.Row" Value="1" />
-                    <Setter Property="Grid.RowSpan" Value="1" />
-                </Style>
-            </Style>
-        </Style>
-
-        <Style Selector="^:right">
-            <Setter Property="Template">
-                <ControlTemplate>
-                    <Grid Name="Container" Background="{TemplateBinding Background}">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}" />
-                        </Grid.RowDefinitions>
-
-                        <Panel
-                            Name="PART_PaneRoot"
-                            VerticalAlignment="Bottom"
-                            Background="{TemplateBinding PaneBackground}"
-                            ClipToBounds="True"
-                            ZIndex="100">
-                            <ContentPresenter
-                                Name="PART_PanePresenter"
-                                Content="{TemplateBinding Pane}"
-                                ContentTemplate="{TemplateBinding PaneTemplate}" />
-                            <Rectangle
-                                Name="HCPaneBorder"
-                                Height="1"
-                                VerticalAlignment="Top"
-                                Fill="{DynamicResource SplitViewSeparatorBackground}" />
-                        </Panel>
-
-                        <Panel Name="ContentRoot">
-                            <ContentPresenter
-                                Name="PART_ContentPresenter"
-                                Content="{TemplateBinding Content}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}" />
-                            <Rectangle Name="LightDismissLayer" IsVisible="False" />
-                        </Panel>
-
-                    </Grid>
-                </ControlTemplate>
-            </Setter>
-
-            <Style Selector="^:overlay">
-                <Style Selector="^ /template/ Panel#PART_PaneRoot">
-                    <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-                    <Setter Property="Grid.RowSpan" Value="2" />
-                    <Setter Property="Grid.Row" Value="1" />
-                </Style>
-                <Style Selector="^ /template/ Panel#ContentRoot">
-                    <Setter Property="Grid.Row" Value="0" />
-                    <Setter Property="Grid.RowSpan" Value="2" />
-                </Style>
-            </Style>
-
-            <Style Selector="^:compactinline">
-                <Style Selector="^ /template/ Panel#PART_PaneRoot">
-                    <Setter Property="Grid.RowSpan" Value="1" />
-                    <Setter Property="Grid.Row" Value="1" />
-                    <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-                </Style>
-                <Style Selector="^ /template/ Panel#ContentRoot">
-                    <Setter Property="Grid.Row" Value="0" />
-                    <Setter Property="Grid.RowSpan" Value="1" />
-                </Style>
-            </Style>
-
-            <Style Selector="^:compactoverlay">
-                <Style Selector="^ /template/ Panel#PART_PaneRoot">
-                    <Setter Property="Grid.RowSpan" Value="2" />
-                    <Setter Property="Grid.Row" Value="1" />
-                    <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-                </Style>
-                <Style Selector="^ /template/ Panel#ContentRoot">
-                    <Setter Property="Grid.Row" Value="0" />
-                    <Setter Property="Grid.RowSpan" Value="1" />
-                </Style>
-            </Style>
-
-            <Style Selector="^:inline">
-                <Style Selector="^ /template/ Panel#PART_PaneRoot">
-                    <Setter Property="Grid.RowSpan" Value="1" />
-                    <Setter Property="Grid.Row" Value="1" />
-                    <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-                </Style>
-                <Style Selector="^ /template/ Panel#ContentRoot">
-                    <Setter Property="Grid.Row" Value="0" />
-                    <Setter Property="Grid.RowSpan" Value="1" />
-                </Style>
-            </Style>
-        </Style>
-
-        <Style Selector="^:open">
-            <Style Selector="^ /template/ Panel#PART_PaneRoot">
-                <Setter Property="Transitions">
-                    <Transitions>
-                        <DoubleTransition
-                            Easing="{StaticResource SplitViewPaneAnimationEasing}"
-                            Property="Height"
-                            Duration="{StaticResource SplitViewPaneAnimationOpenDuration}" />
-                    </Transitions>
-                </Setter>
-                <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=OpenPaneLength}" />
-            </Style>
-            <Style Selector="^ /template/ Rectangle#LightDismissLayer">
-                <Setter Property="Transitions">
-                    <Transitions>
-                        <DoubleTransition
-                            Easing="{StaticResource SplitViewPaneAnimationEasing}"
-                            Property="Opacity"
-                            Duration="{StaticResource SplitViewPaneAnimationOpenDuration}" />
-                    </Transitions>
-                </Setter>
-                <Setter Property="Opacity" Value="1.0" />
-            </Style>
-        </Style>
-
-        <Style Selector="^:closed">
-            <Style Selector="^ /template/ Panel#PART_PaneRoot">
-                <Setter Property="Transitions">
-                    <Transitions>
-                        <DoubleTransition
-                            Easing="{StaticResource SplitViewPaneAnimationEasing}"
-                            Property="Height"
-                            Duration="{StaticResource SplitViewPaneAnimationCloseDuration}" />
-                    </Transitions>
-                </Setter>
-                <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-            </Style>
-            <Style Selector="^ /template/ Rectangle#LightDismissLayer">
-                <Setter Property="Transitions">
-                    <Transitions>
-                        <DoubleTransition
-                            Easing="{StaticResource SplitViewPaneAnimationEasing}"
-                            Property="Opacity"
-                            Duration="{StaticResource SplitViewPaneAnimationCloseDuration}" />
-                    </Transitions>
-                </Setter>
-                <Setter Property="Opacity" Value="0.0" />
-            </Style>
-        </Style>
-
-        <Style Selector="^:lightDismiss /template/ Rectangle#LightDismissLayer">
-            <Setter Property="Fill" Value="{DynamicResource SplitViewMaskBrush}" />
-        </Style>
-        <Style Selector="^:overlay:open /template/ Rectangle#LightDismissLayer">
-            <Setter Property="IsVisible" Value="True" />
-        </Style>
-        <Style Selector="^:compactoverlay:open /template/ Rectangle#LightDismissLayer">
-            <Setter Property="IsVisible" Value="True" />
-        </Style>
-    </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/TabbedPage.axaml

@@ -11,8 +11,7 @@
                 <TabControl
                     Name="PART_TabControl"
                     Background="{TemplateBinding Background}"
-                    Theme="{StaticResource LineTabControl}"
+                    Theme="{StaticResource LineTabControl}" />
-                    ItemsSource="{TemplateBinding Pages}" />
             </ControlTemplate>
         </Setter>
     </ControlTheme>
@@ -22,8 +21,7 @@
                 <TabControl
                     Name="PART_TabControl"
                     Background="{TemplateBinding Background}"
-                    Theme="{StaticResource CardTabControl}"
+                    Theme="{StaticResource CardTabControl}" />
-                    ItemsSource="{TemplateBinding Pages}" />
             </ControlTemplate>
         </Setter>
     </ControlTheme>
@@ -33,8 +31,7 @@
                 <TabControl
                     Name="PART_TabControl"
                     Background="{TemplateBinding Background}"
-                    Theme="{StaticResource ButtonTabControl}"
+                    Theme="{StaticResource ButtonTabControl}" />
-                    ItemsSource="{TemplateBinding Pages}" />
             </ControlTemplate>
         </Setter>
     </ControlTheme>

src/Semi.Avalonia/Controls/TextBox.axaml

@@ -22,6 +22,27 @@
             IsEnabled="{Binding $parent[TextBox].CanPaste}" />
     </MenuFlyout>
 
+    <MenuFlyout
+        x:Key="HorizontalTextBoxContextFlyout"
+        ShowMode="{OnFormFactor Desktop=Standard, Mobile=Transient}"
+        FlyoutPresenterTheme="{StaticResource HorizontalMenuFlyoutPresenter}"
+        ItemContainerTheme="{StaticResource TopLevelMenuItem}">
+        <MenuItem
+            Command="{Binding $parent[TextBox].Cut}"
+            Header="{DynamicResource STRING_MENU_CUT}"
+            IsEnabled="{Binding $parent[TextBox].CanCut}"
+            IsVisible="{Binding $parent[TextBox].CanCut}" />
+        <MenuItem
+            Command="{Binding $parent[TextBox].Copy}"
+            Header="{DynamicResource STRING_MENU_COPY}"
+            IsEnabled="{Binding $parent[TextBox].CanCopy}"
+            IsVisible="{Binding $parent[TextBox].CanCopy}" />
+        <MenuItem
+            Command="{Binding $parent[TextBox].Paste}"
+            Header="{DynamicResource STRING_MENU_PASTE}"
+            IsEnabled="{Binding $parent[TextBox].CanPaste}" />
+    </MenuFlyout>
+
     <ControlTheme x:Key="{x:Type TextBox}" TargetType="TextBox">
         <Setter Property="Foreground" Value="{DynamicResource TextBoxForeground}" />
         <Setter Property="PlaceholderForeground" Value="{DynamicResource TextBoxPlaceholderForeground}" />
@@ -60,6 +81,7 @@
                                 Foreground="{DynamicResource TextBoxInnerForeground}"
                                 IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerLeftContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
                             <ScrollViewer
+                                Name="PART_ScrollViewer"
                                 Grid.Column="1"
                                 AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
                                 HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
@@ -133,6 +155,10 @@
             </ControlTemplate>
         </Setter>
 
+        <Style Selector="^:touch-mode">
+            <Setter Property="ContextFlyout" Value="{StaticResource HorizontalTextBoxContextFlyout}" />
+        </Style>
+
         <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
             <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource TextBoxPointeroverBorderBrush}" />
@@ -294,6 +320,7 @@
                                 Foreground="{DynamicResource TextBoxInnerForeground}"
                                 IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerLeftContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
                             <ScrollViewer
+                                Name="PART_ScrollViewer"
                                 Grid.Column="1"
                                 AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
                                 HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
@@ -304,7 +331,6 @@
                                         Name="PART_Placeholder"
                                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                        Opacity="0.5"
                                         Foreground="{TemplateBinding PlaceholderForeground}"
                                         Text="{TemplateBinding PlaceholderText}"
                                         TextAlignment="{TemplateBinding TextAlignment}"
@@ -368,6 +394,10 @@
             </ControlTemplate>
         </Setter>
 
+        <Style Selector="^:touch-mode">
+            <Setter Property="ContextFlyout" Value="{StaticResource HorizontalTextBoxContextFlyout}" />
+        </Style>
+
         <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
             <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource TextBoxPointeroverBorderBrush}" />
@@ -516,6 +546,7 @@
                             Foreground="{DynamicResource TextBoxInnerForeground}"
                             IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerLeftContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
                         <ScrollViewer
+                            Name="PART_ScrollViewer"
                             Grid.Column="1"
                             AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
                             HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
@@ -526,7 +557,6 @@
                                     Name="PART_Placeholder"
                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Opacity="0.5"
                                     Foreground="{TemplateBinding PlaceholderForeground}"
                                     Text="{TemplateBinding PlaceholderText}"
                                     TextAlignment="{TemplateBinding TextAlignment}"
@@ -573,6 +603,10 @@
             </ControlTemplate>
         </Setter>
 
+        <Style Selector="^:touch-mode">
+            <Setter Property="ContextFlyout" Value="{StaticResource HorizontalTextBoxContextFlyout}" />
+        </Style>
+
         <Style Selector="^:disabled">
             <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
         </Style>

src/Semi.Avalonia/Controls/WindowDrawnDecorations.axaml

@@ -187,6 +187,20 @@
             </Style>
         </Style>
 
+        <!-- Hide caption buttons when the platform does not support the action -->
+        <Style Selector="^:not(:has-minimize) /template/ Button#PART_MinimizeButton">
+            <Setter Property="IsVisible" Value="False"/>
+        </Style>
+        <Style Selector="^:not(:has-maximize) /template/ Button#PART_MaximizeButton">
+            <Setter Property="IsVisible" Value="False"/>
+        </Style>
+        <Style Selector="^:not(:has-fullscreen) /template/ Button#PART_FullScreenButton">
+            <Setter Property="IsVisible" Value="False"/>
+        </Style>
+        <Style Selector="^:not(:has-fullscreen) /template/ Button#PART_PopoverFullScreenButton">
+            <Setter Property="IsVisible" Value="False"/>
+        </Style>
+
         <!--  Fullscreen: hide overlay and titlebar (popover takes over)  -->
         <Style Selector="^:fullscreen">
             <Style Selector="^ /template/ Panel#PART_TitleTextPanel">

src/Semi.Avalonia/Icons/FillIcons.axaml

@@ -610,6 +610,9 @@
     <StreamGeometry x:Key="SemiIconMaximize">
         M14 3.5c0-.83.67-1.5 1.5-1.5h3A3.5 3.5 0 0 1 22 5.5v3a1.5 1.5 0 0 1-3 0v-3a.5.5 0 0 0-.5-.5h-3A1.5 1.5 0 0 1 14 3.5Zm-12 2A3.5 3.5 0 0 1 5.5 2h3a1.5 1.5 0 1 1 0 3h-3a.5.5 0 0 0-.5.5v3a1.5 1.5 0 1 1-3 0v-3ZM3.5 14c.83 0 1.5.67 1.5 1.5v3c0 .28.22.5.5.5h3a1.5 1.5 0 0 1 0 3h-3A3.5 3.5 0 0 1 2 18.5v-3c0-.83.67-1.5 1.5-1.5Zm17 0c.83 0 1.5.67 1.5 1.5v3a3.5 3.5 0 0 1-3.5 3.5h-3a1.5 1.5 0 0 1 0-3h3a.5.5 0 0 0 .5-.5v-3c0-.83.67-1.5 1.5-1.5Z
     </StreamGeometry>
+    <StreamGeometry x:Key="SemiIconMaximize2">
+        M5 5.5A.5.5 0 015.5 5h13a.5.5 0 01.5.5v13a.5.5 0 01-.5.5H5.5A.5.5 0 015 18.5V5.5Zm-3 0v13A3.5 3.5 0 005.5 22h13A3.5 3.5 0 0022 18.5V5A3.5 3.5 0 0018.5 2H5.5A3.5 3.5 0 002 5.5Z
+    </StreamGeometry>
     <StreamGeometry x:Key="SemiIconMember">
         M.83 7.66c-.24-.77.67-1.37 1.28-.85l1.86 1.6a3 3 0 0 0 4.68-1.04L11.1 2a1 1 0 0 1 1.82 0l2.44 5.37a3 3 0 0 0 4.68 1.03l1.86-1.59c.6-.52 1.52.08 1.28.85L19.44 19.6a2 2 0 0 1-1.91 1.4H6.47a2 2 0 0 1-1.9-1.4L.82 7.66Z
     </StreamGeometry>
@@ -750,6 +753,9 @@
         M4.5 2C3.67 2 3 2.67 3 3.5v17a1.5 1.5 0 0 0 3 0v-17C6 2.67 5.33 2 4.5 2Z
         M8 11.21l 11.38-8.94a1 1 0 0 1 1.62.79v17.88a1 1 0 0 1-1.62.79L8 12.79a1 1 0 0 1 0-1.58Z
     </StreamGeometry>
+    <StreamGeometry x:Key="SemiIconRestore">
+        M3 9A2 2 0 015 7H15a2 2 0 012 2V19a2 2 0 01-2 2H5A2 2 0 013 19V9Zm3 1v8h8V10H6ZM7 4c0-1.1.9-2 2-2h11a2 2 0 012 2v11a2 2 0 01-2 2h-1V5H7V4Z
+    </StreamGeometry>
     <StreamGeometry x:Key="SemiIconRotate">
         M14.2 2.2A1 1 0 0 0 12.8.8l-2.5 2.5a1 1 0 0 0 0 1.4l2.5 2.5a1 1 0 1 0 1.4-1.4l-.79-.8H16a5 5 0 0 1 5 5v2a1 1 0 1 0 2 0v-2a7 7 0 0 0-7-7h-2.59l.8-.8Z
         M3 10c0-1.1.9-2 2-2h12a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V10Z

src/Semi.Avalonia/Icons/StrokedIcons.axaml

@@ -325,6 +325,9 @@
     <StreamGeometry x:Key="SemiIconMarginStroked">
         M4 2a2 2 0 0 0-2 2v16c0 1.1.9 2 2 2h16a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H4Zm9 2h7v7h-2a1 1 0 1 0 0 2h2v7h-7v-2a1 1 0 1 0-2 0v2H4v-7h2a1 1 0 1 0 0-2H4V4h7v2a1 1 0 1 0 2 0V4ZM9 8a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1H9Zm1 6v-4h4v4h-4Z
     </StreamGeometry>
+    <StreamGeometry x:Key="SemiIconMaximize2Stroked">
+        M4 4H21V20H4V4ZM2 3V21a1 1 0 001 1H22a1 1 0 001-1V3A1 1 0 0022 2H3A1 1 0 002 3Z
+    </StreamGeometry>
     <StreamGeometry x:Key="SemiIconMicrophoneStroked">
         M16 21a1 1 0 1 1 0 2H8a1 1 0 1 1 0-2h8Zm3-10.5a1 1 0 0 1 1 1 8 8 1 1 1-16 0 1 1 0 1 1 2 0 6 6 0 0 0 12 0 1 1 0 0 1 1-1ZM12 1a4.5 4.5 0 0 1 4.5 4.5v6a4.5 4.5 1 1 1-9 0v-6A4.5 4.5 0 0 1 12 1Zm0 2a2.5 2.5 0 0 0-2.5 2.5v6a2.5 2.5 0 0 0 5 0v-6A2.5 2.5 0 0 0 12 3Z
     </StreamGeometry>
@@ -408,6 +411,9 @@
     <StreamGeometry x:Key="SemiIconReplyStroked">
         m3.88 12 5.68 5.98V16.5a3 3 0 0 1 3.01-3c2.3 0 4.44.06 6.26.85.45.2.86.42 1.24.69a7.63 7.63 0 0 0-1.64-2.9c-1.3-1.43-3.27-2.43-6-2.6A3.05 3.05 0 0 1 9.56 6.5v-.48L3.88 12Zm16.6 6.25c-1.81-2.53-3.94-2.73-7.92-2.75a1 1 0 0 0-1 1v4a1 1 0 0 1-1.71.69l-8.07-8.5a1 1 0 0 1 0-1.38l8.07-8.5a1 1 0 0 1 1.71.7v3c0 .55.45.99 1 1.02 6.22.4 9.8 4.6 9.94 10.14a13.2 13.2 0 0 1-.03.77c-.04.35-.1.8-.2 1.18-.1.35-.2.64-.33.7-.13.05-.28-.02-.43-.33a14.18 14.18 0 0 0-1.03-1.74Z
     </StreamGeometry>
+    <StreamGeometry x:Key="SemiIconRestoreStroked">
+        M22 16a2 2 0 01-2 2V4H6c0-1.1.9-2 2-2h12a2 2 0 012 2v12ZM2 8c0-1.1.9-2 2-2h12a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V8ZM4 8V20H16V8H4Z
+    </StreamGeometry>
     <StreamGeometry x:Key="SemiIconRingChartStroked">
         M20.95 13A9 9 0 1 1 11 3.05V7.1a5 5 0 1 0 5.9 5.9h4.05Zm0-2H16.9A5 5 0 0 0 13 7.1V3.05A9 9 0 0 1 20.95 11ZM23 12a11 11 0 1 1-22 0 11 11 0 0 1 22 0Zm-8 0a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z
     </StreamGeometry>

src/Semi.Avalonia/Semi.Avalonia.csproj

@@ -2,8 +2,8 @@
 
     <PropertyGroup>
         <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
-        <Version>12.0.0-rc1</Version>
+        <Version>12.0.0</Version>
-        <PackageReleaseNotes>Update to Semi.Avalonia 12.0.0-rc1</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Semi.Avalonia 12.0.0</PackageReleaseNotes>
         <Title>Semi.Avalonia</Title>
     </PropertyGroup>
 

src/Semi.Avalonia/Themes/Dark/CheckBox.axaml

@@ -25,7 +25,4 @@
     <StaticResource x:Key="CheckBoxCardPressedBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="CheckBoxCardCheckedPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
     <StaticResource x:Key="CheckBoxCardCheckedPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
-
-    <!-- Obsolete -->
-    <StaticResource x:Key="CheckBoxGlyphDisabledFill" ResourceKey="SemiColorWhite" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Dark/CommandBar.axaml

@@ -1,18 +1,18 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  AppBarButton / AppBarToggleButton  -->
+    <!--  CommandBarButton / CommandBarToggleButton  -->
-    <SolidColorBrush x:Key="AppBarButtonBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CommandBarButtonBackground" Color="Transparent" />
-    <StaticResource x:Key="AppBarButtonForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CommandBarButtonForeground" ResourceKey="SemiColorText0" />
-    <StaticResource x:Key="AppBarButtonPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CommandBarButtonPointeroverBackground" ResourceKey="SemiColorFill0" />
-    <StaticResource x:Key="AppBarButtonPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CommandBarButtonPressedBackground" ResourceKey="SemiColorFill1" />
-    <StaticResource x:Key="AppBarButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CommandBarButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
-    <!--  AppBarToggleButton checked state  -->
+    <!--  CommandBarToggleButton checked state  -->
-    <StaticResource x:Key="AppBarToggleButtonCheckedForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedForeground" ResourceKey="SemiColorPrimary" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedBackground" ResourceKey="SemiColorPrimaryLight" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedPointeroverBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedPointeroverBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedPressedBackground" ResourceKey="SemiColorPrimaryLightActive" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedPressedBackground" ResourceKey="SemiColorPrimaryLightActive" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorPrimaryDisabled" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorPrimaryDisabled" />
-    <!--  AppBarSeparator  -->
+    <!--  CommandBarSeparator  -->
-    <StaticResource x:Key="AppBarSeparatorBackground" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="CommandBarSeparatorBackground" ResourceKey="SemiColorBorder" />
     <!--  CommandBar  -->
     <StaticResource x:Key="CommandBarBackground" ResourceKey="SemiColorBackground1" />
     <StaticResource x:Key="CommandBarForeground" ResourceKey="SemiColorText0" />

src/Semi.Avalonia/Themes/Dark/DrawerPage.axaml

@@ -4,10 +4,6 @@
     <StaticResource x:Key="DrawerPageForeground" ResourceKey="SemiColorText0" />
     <!--  Top bar  -->
     <StaticResource x:Key="DrawerPageTopBarBackground" ResourceKey="SemiColorBackground1" />
-    <StaticResource x:Key="DrawerPageTopBarBorderBrush" ResourceKey="SemiColorBorder" />
-    <!--  Drawer pane  -->
-    <StaticResource x:Key="DrawerPageDrawerBackground" ResourceKey="SemiColorNavBackground" />
     <!--  Pane button  -->
-    <SolidColorBrush x:Key="DrawerPagePaneButtonBackground" Color="Transparent" />
     <StaticResource x:Key="DrawerPagePaneButtonForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Dark/Label.axaml

@@ -102,12 +102,4 @@
     <StaticResource x:Key="LabelTagColorfulGradientGhostBorderBrush" ResourceKey="SemiColorAIGeneral" />
     <StaticResource x:Key="LabelTagColorfulGradientSolidForeground" ResourceKey="SemiColorWhite" />
     <StaticResource x:Key="LabelTagColorfulGradientSolidBackground" ResourceKey="SemiColorAIGeneral" />
-
-    <!-- Obsolete -->
-    <StaticResource x:Key="LabelTagLightWhiteForeground" ResourceKey="LabelTagSolidWhiteForeground" />
-    <StaticResource x:Key="LabelTagLightWhiteBackground" ResourceKey="LabelTagSolidWhiteBackground" />
-    <StaticResource x:Key="LabelTagLightWhiteBorderBrush" ResourceKey="LabelTagSolidWhiteBorderBrush" />
-    <StaticResource x:Key="LabelTagGhostWhiteForeground" ResourceKey="LabelTagSolidWhiteForeground" />
-    <StaticResource x:Key="LabelTagGhostWhiteBackground" ResourceKey="LabelTagSolidWhiteBackground" />
-    <StaticResource x:Key="LabelTagGhostWhiteBorderBrush" ResourceKey="LabelTagSolidWhiteBorderBrush" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Dark/NavigationPage.axaml

@@ -1,14 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  NavigationPage  -->
-    <StaticResource x:Key="NavigationPageBackground" ResourceKey="SemiColorBackground0" />
-    <StaticResource x:Key="NavigationPageForeground" ResourceKey="SemiColorText0" />
     <!--  Navigation bar  -->
     <StaticResource x:Key="NavigationPageBarBackground" ResourceKey="SemiColorBackground1" />
-    <StaticResource x:Key="NavigationPageBarForeground" ResourceKey="SemiColorText0" />
     <StaticResource x:Key="NavigationPageBarBorderBrush" ResourceKey="SemiColorBorder" />
-    <!--  Back button  -->
-    <SolidColorBrush x:Key="NavigationPageBackButtonBackground" Color="Transparent" />
-    <StaticResource x:Key="NavigationPageBackButtonForeground" ResourceKey="SemiColorText0" />
-    <StaticResource x:Key="NavigationPageBackButtonPointeroverBackground" ResourceKey="SemiColorFill0" />
-    <StaticResource x:Key="NavigationPageBackButtonPressedBackground" ResourceKey="SemiColorFill1" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml

@@ -2,7 +2,6 @@
     <StaticResource x:Key="ProgressBarIndicatorBrush" ResourceKey="SemiColorPrimary" />
     <StaticResource x:Key="ProgressBarBackground" ResourceKey="SemiColorFill0" />
     <StaticResource x:Key="ProgressBarTextForeground" ResourceKey="SemiColorText0" />
-    <StaticResource x:Key="ProgressBarOuterTextForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
     <StaticResource x:Key="ProgressBarPrimaryForeground" ResourceKey="SemiColorPrimary" />
     <StaticResource x:Key="ProgressBarSecondaryForeground" ResourceKey="SemiColorSecondary" />
@@ -10,6 +9,4 @@
     <StaticResource x:Key="ProgressBarSuccessForeground" ResourceKey="SemiColorSuccess" />
     <StaticResource x:Key="ProgressBarWarningForeground" ResourceKey="SemiColorWarning" />
     <StaticResource x:Key="ProgressBarDangerForeground" ResourceKey="SemiColorDanger" />
-    <!-- Error style is obsolete, use Danger instead -->
-    <StaticResource x:Key="ProgressBarErrorForeground" ResourceKey="SemiColorDanger" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/HighContrast/CheckBox.axaml

@@ -25,7 +25,4 @@
     <StaticResource x:Key="CheckBoxCardPressedBackground" ResourceKey="SemiColorWindow" />
     <StaticResource x:Key="CheckBoxCardCheckedPointeroverBorderBrush" ResourceKey="SemiColorButtonText" />
     <StaticResource x:Key="CheckBoxCardCheckedPressedBorderBrush" ResourceKey="SemiColorHighlight" />
-
-    <!-- Obsolete -->
-    <StaticResource x:Key="CheckBoxGlyphDisabledFill" ResourceKey="SemiColorHighlightText" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/HighContrast/CommandBar.axaml

@@ -1,18 +1,18 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  AppBarButton / AppBarToggleButton  -->
+    <!--  CommandBarButton / CommandBarToggleButton  -->
-    <SolidColorBrush x:Key="AppBarButtonBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CommandBarButtonBackground" Color="Transparent" />
-    <StaticResource x:Key="AppBarButtonForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="CommandBarButtonForeground" ResourceKey="SemiColorWindowText" />
-    <StaticResource x:Key="AppBarButtonPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CommandBarButtonPointeroverBackground" ResourceKey="SemiColorHighlight" />
-    <StaticResource x:Key="AppBarButtonPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CommandBarButtonPressedBackground" ResourceKey="SemiColorHighlight" />
-    <StaticResource x:Key="AppBarButtonDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CommandBarButtonDisabledForeground" ResourceKey="SemiColorGrayText" />
-    <!--  AppBarToggleButton checked state  -->
+    <!--  CommandBarToggleButton checked state  -->
-    <StaticResource x:Key="AppBarToggleButtonCheckedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedForeground" ResourceKey="SemiColorHighlightText" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedBackground" ResourceKey="SemiColorHighlight" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedPointeroverBackground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedPointeroverBackground" ResourceKey="SemiColorButtonText" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedPressedBackground" ResourceKey="SemiColorButtonFace" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedPressedBackground" ResourceKey="SemiColorButtonFace" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorGrayText" />
-    <!--  AppBarSeparator  -->
+    <!--  CommandBarSeparator  -->
-    <StaticResource x:Key="AppBarSeparatorBackground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="CommandBarSeparatorBackground" ResourceKey="SemiColorWindowText" />
     <!--  CommandBar  -->
     <StaticResource x:Key="CommandBarBackground" ResourceKey="SemiColorWindow" />
     <StaticResource x:Key="CommandBarForeground" ResourceKey="SemiColorWindowText" />

src/Semi.Avalonia/Themes/HighContrast/DrawerPage.axaml

@@ -4,10 +4,6 @@
     <StaticResource x:Key="DrawerPageForeground" ResourceKey="SemiColorWindowText" />
     <!--  Top bar  -->
     <StaticResource x:Key="DrawerPageTopBarBackground" ResourceKey="SemiColorWindow" />
-    <StaticResource x:Key="DrawerPageTopBarBorderBrush" ResourceKey="SemiColorWindowText" />
-    <!--  Drawer pane  -->
-    <StaticResource x:Key="DrawerPageDrawerBackground" ResourceKey="SemiColorWindow" />
     <!--  Pane button  -->
-    <SolidColorBrush x:Key="DrawerPagePaneButtonBackground" Color="Transparent" />
     <StaticResource x:Key="DrawerPagePaneButtonForeground" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/HighContrast/NavigationPage.axaml

@@ -1,14 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  NavigationPage  -->
-    <StaticResource x:Key="NavigationPageBackground" ResourceKey="SemiColorWindow" />
-    <StaticResource x:Key="NavigationPageForeground" ResourceKey="SemiColorWindowText" />
     <!--  Navigation bar  -->
     <StaticResource x:Key="NavigationPageBarBackground" ResourceKey="SemiColorWindow" />
-    <StaticResource x:Key="NavigationPageBarForeground" ResourceKey="SemiColorWindowText" />
     <StaticResource x:Key="NavigationPageBarBorderBrush" ResourceKey="SemiColorWindowText" />
-    <!--  Back button  -->
-    <SolidColorBrush x:Key="NavigationPageBackButtonBackground" Color="Transparent" />
-    <StaticResource x:Key="NavigationPageBackButtonForeground" ResourceKey="SemiColorWindowText" />
-    <StaticResource x:Key="NavigationPageBackButtonPointeroverBackground" ResourceKey="SemiColorHighlight" />
-    <StaticResource x:Key="NavigationPageBackButtonPressedBackground" ResourceKey="SemiColorHighlightText" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/HighContrast/ProgressBar.axaml

@@ -2,7 +2,6 @@
     <StaticResource x:Key="ProgressBarIndicatorBrush" ResourceKey="SemiColorHighlight" />
     <StaticResource x:Key="ProgressBarBackground" ResourceKey="SemiColorHighlightText" />
     <StaticResource x:Key="ProgressBarTextForeground" ResourceKey="SemiColorWindowText" />
-    <StaticResource x:Key="ProgressBarOuterTextForeground" ResourceKey="SemiColorWindowText" />
     <StaticResource x:Key="ProgressBarRootBorderBrush" ResourceKey="SemiColorWindowText" />
     <StaticResource x:Key="ProgressBarPrimaryForeground" ResourceKey="SemiColorHighlight" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Light/CheckBox.axaml

@@ -25,7 +25,4 @@
     <StaticResource x:Key="CheckBoxCardPressedBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="CheckBoxCardCheckedPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
     <StaticResource x:Key="CheckBoxCardCheckedPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
-
-    <!-- Obsolete -->
-    <StaticResource x:Key="CheckBoxGlyphDisabledFill" ResourceKey="SemiColorWhite" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Light/CommandBar.axaml

@@ -1,18 +1,18 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  AppBarButton / AppBarToggleButton  -->
+    <!--  CommandBarButton / CommandBarToggleButton  -->
-    <SolidColorBrush x:Key="AppBarButtonBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CommandBarButtonBackground" Color="Transparent" />
-    <StaticResource x:Key="AppBarButtonForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CommandBarButtonForeground" ResourceKey="SemiColorText0" />
-    <StaticResource x:Key="AppBarButtonPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CommandBarButtonPointeroverBackground" ResourceKey="SemiColorFill0" />
-    <StaticResource x:Key="AppBarButtonPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CommandBarButtonPressedBackground" ResourceKey="SemiColorFill1" />
-    <StaticResource x:Key="AppBarButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CommandBarButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
-    <!--  AppBarToggleButton checked state  -->
+    <!--  CommandBarToggleButton checked state  -->
-    <StaticResource x:Key="AppBarToggleButtonCheckedForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedForeground" ResourceKey="SemiColorPrimary" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedBackground" ResourceKey="SemiColorPrimaryLight" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedPointeroverBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedPointeroverBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedPressedBackground" ResourceKey="SemiColorPrimaryLightActive" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedPressedBackground" ResourceKey="SemiColorPrimaryLightActive" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorPrimaryDisabled" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorPrimaryDisabled" />
-    <!--  AppBarSeparator  -->
+    <!--  CommandBarSeparator  -->
-    <StaticResource x:Key="AppBarSeparatorBackground" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="CommandBarSeparatorBackground" ResourceKey="SemiColorBorder" />
     <!--  CommandBar  -->
     <StaticResource x:Key="CommandBarBackground" ResourceKey="SemiColorBackground1" />
     <StaticResource x:Key="CommandBarForeground" ResourceKey="SemiColorText0" />

src/Semi.Avalonia/Themes/Light/DrawerPage.axaml

@@ -4,10 +4,6 @@
     <StaticResource x:Key="DrawerPageForeground" ResourceKey="SemiColorText0" />
     <!--  Top bar  -->
     <StaticResource x:Key="DrawerPageTopBarBackground" ResourceKey="SemiColorBackground1" />
-    <StaticResource x:Key="DrawerPageTopBarBorderBrush" ResourceKey="SemiColorBorder" />
-    <!--  Drawer pane  -->
-    <StaticResource x:Key="DrawerPageDrawerBackground" ResourceKey="SemiColorNavBackground" />
     <!--  Pane button  -->
-    <SolidColorBrush x:Key="DrawerPagePaneButtonBackground" Color="Transparent" />
     <StaticResource x:Key="DrawerPagePaneButtonForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Light/Label.axaml

@@ -102,12 +102,4 @@
     <StaticResource x:Key="LabelTagColorfulGradientGhostBorderBrush" ResourceKey="SemiColorAIGeneral" />
     <StaticResource x:Key="LabelTagColorfulGradientSolidForeground" ResourceKey="SemiColorWhite" />
     <StaticResource x:Key="LabelTagColorfulGradientSolidBackground" ResourceKey="SemiColorAIGeneral" />
-
-    <!-- Obsolete -->
-    <StaticResource x:Key="LabelTagLightWhiteForeground" ResourceKey="LabelTagSolidWhiteForeground" />
-    <StaticResource x:Key="LabelTagLightWhiteBackground" ResourceKey="LabelTagSolidWhiteBackground" />
-    <StaticResource x:Key="LabelTagLightWhiteBorderBrush" ResourceKey="LabelTagSolidWhiteBorderBrush" />
-    <StaticResource x:Key="LabelTagGhostWhiteForeground" ResourceKey="LabelTagSolidWhiteForeground" />
-    <StaticResource x:Key="LabelTagGhostWhiteBackground" ResourceKey="LabelTagSolidWhiteBackground" />
-    <StaticResource x:Key="LabelTagGhostWhiteBorderBrush" ResourceKey="LabelTagSolidWhiteBorderBrush" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Light/NavigationPage.axaml

@@ -1,14 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  NavigationPage  -->
-    <StaticResource x:Key="NavigationPageBackground" ResourceKey="SemiColorBackground0" />
-    <StaticResource x:Key="NavigationPageForeground" ResourceKey="SemiColorText0" />
     <!--  Navigation bar  -->
     <StaticResource x:Key="NavigationPageBarBackground" ResourceKey="SemiColorBackground1" />
-    <StaticResource x:Key="NavigationPageBarForeground" ResourceKey="SemiColorText0" />
     <StaticResource x:Key="NavigationPageBarBorderBrush" ResourceKey="SemiColorBorder" />
-    <!--  Back button  -->
-    <SolidColorBrush x:Key="NavigationPageBackButtonBackground" Color="Transparent" />
-    <StaticResource x:Key="NavigationPageBackButtonForeground" ResourceKey="SemiColorText0" />
-    <StaticResource x:Key="NavigationPageBackButtonPointeroverBackground" ResourceKey="SemiColorFill0" />
-    <StaticResource x:Key="NavigationPageBackButtonPressedBackground" ResourceKey="SemiColorFill1" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Light/ProgressBar.axaml

@@ -2,7 +2,6 @@
     <StaticResource x:Key="ProgressBarIndicatorBrush" ResourceKey="SemiColorPrimary" />
     <StaticResource x:Key="ProgressBarBackground" ResourceKey="SemiColorFill0" />
     <StaticResource x:Key="ProgressBarTextForeground" ResourceKey="SemiColorText0" />
-    <StaticResource x:Key="ProgressBarOuterTextForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
     <StaticResource x:Key="ProgressBarPrimaryForeground" ResourceKey="SemiColorPrimary" />
     <StaticResource x:Key="ProgressBarSecondaryForeground" ResourceKey="SemiColorSecondary" />
@@ -10,6 +9,4 @@
     <StaticResource x:Key="ProgressBarSuccessForeground" ResourceKey="SemiColorSuccess" />
     <StaticResource x:Key="ProgressBarWarningForeground" ResourceKey="SemiColorWarning" />
     <StaticResource x:Key="ProgressBarDangerForeground" ResourceKey="SemiColorDanger" />
-    <!-- Error style is obsolete, use Danger instead -->
-    <StaticResource x:Key="ProgressBarErrorForeground" ResourceKey="SemiColorDanger" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Shared/CommandBar.axaml

@@ -1,20 +1,20 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  AppBarButton / AppBarToggleButton  -->
+    <!--  CommandBarButton / CommandBarToggleButton  -->
-    <x:Double x:Key="AppBarButtonWidth">64</x:Double>
+    <x:Double x:Key="CommandBarButtonWidth">64</x:Double>
-    <x:Double x:Key="AppBarButtonCompactWidth">40</x:Double>
+    <x:Double x:Key="CommandBarButtonCompactWidth">40</x:Double>
-    <x:Double x:Key="AppBarButtonMinHeight">40</x:Double>
+    <x:Double x:Key="CommandBarButtonMinHeight">40</x:Double>
-    <Thickness x:Key="AppBarButtonPadding">8 4</Thickness>
+    <Thickness x:Key="CommandBarButtonPadding">8 4</Thickness>
-    <x:Double x:Key="AppBarButtonPanelSpacing">4</x:Double>
+    <x:Double x:Key="CommandBarButtonPanelSpacing">4</x:Double>
-    <StaticResource x:Key="AppBarButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <StaticResource x:Key="CommandBarButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
-    <StaticResource x:Key="AppBarButtonLabelFontSize" ResourceKey="SemiFontSizeSmall" />
+    <StaticResource x:Key="CommandBarButtonLabelFontSize" ResourceKey="SemiFontSizeSmall" />
-    <x:Double x:Key="AppBarButtonOverflowMinHeight">36</x:Double>
+    <x:Double x:Key="CommandBarButtonOverflowMinHeight">36</x:Double>
-    <Thickness x:Key="AppBarButtonOverflowPadding">12 6</Thickness>
+    <Thickness x:Key="CommandBarButtonOverflowPadding">12 6</Thickness>
-    <!--  AppBarSeparator  -->
+    <!--  CommandBarSeparator  -->
-    <x:Double x:Key="AppBarSeparatorWidth">1</x:Double>
+    <x:Double x:Key="CommandBarSeparatorWidth">1</x:Double>
-    <x:Double x:Key="AppBarSeparatorMinHeight">24</x:Double>
+    <x:Double x:Key="CommandBarSeparatorMinHeight">24</x:Double>
-    <Thickness x:Key="AppBarSeparatorMargin">8 4</Thickness>
+    <Thickness x:Key="CommandBarSeparatorMargin">8 4</Thickness>
-    <x:Double x:Key="AppBarSeparatorOverflowHeight">1</x:Double>
+    <x:Double x:Key="CommandBarSeparatorOverflowHeight">1</x:Double>
-    <Thickness x:Key="AppBarSeparatorOverflowMargin">4 4</Thickness>
+    <Thickness x:Key="CommandBarSeparatorOverflowMargin">4 4</Thickness>
     <!--  CommandBar  -->
     <x:Double x:Key="CommandBarMinHeight">48</x:Double>
     <Thickness x:Key="CommandBarPadding">4 0</Thickness>

src/Semi.Avalonia/Themes/Shared/DrawerPage.axaml

@@ -1,15 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  DrawerPage top bar  -->
-    <x:Double x:Key="DrawerPageTopBarMinHeight">48</x:Double>
+    <x:Double x:Key="DrawerPageTopBarMinHeight">32</x:Double>
-    <Thickness x:Key="DrawerPageTopBarPadding">4 0</Thickness>
-    <Thickness x:Key="DrawerPageTopBarBorderThickness">0 0 0 1</Thickness>
-
-    <!--  DrawerPage pane/drawer  -->
-    <x:Double x:Key="DrawerPageDrawerLength">280</x:Double>
-    <x:Double x:Key="DrawerPageCompactDrawerLength">56</x:Double>
 
     <!--  DrawerPage pane button  -->
-    <x:Double x:Key="DrawerPagePaneButtonSize">32</x:Double>
-    <Thickness x:Key="DrawerPagePaneButtonMargin">8 0</Thickness>
     <StaticResource x:Key="DrawerPageMenuGlyph" ResourceKey="SemiIconMenu" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Shared/Flyout.axaml

@@ -7,4 +7,5 @@
     <x:Double x:Key="FlyoutMaxWidth">600</x:Double>
     <StaticResource x:Key="FlyoutCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
     <StaticResource x:Key="FlyoutPadding" ResourceKey="SemiThicknessTight" />
+    <StaticResource x:Key="HorizontalMenuFlyoutThemeMinWidth" ResourceKey="SemiSpacingExtraLoose" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Shared/NavigationPage.axaml

@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  NavigationPage  -->
-    <x:Double x:Key="NavigationPageBarMinHeight">48</x:Double>
+    <x:Double x:Key="NavigationPageBarMinHeight">32</x:Double>
+    <x:Double x:Key="NavigationPageBarLargeMinHeight">48</x:Double>
     <Thickness x:Key="NavigationPageBarPadding">4 0</Thickness>
     <Thickness x:Key="NavigationPageBarBorderThickness">0 0 0 1</Thickness>
     <StaticResource x:Key="NavigationPageBackButtonGlyph" ResourceKey="SemiIconChevronLeft" />

src/Semi.Avalonia/Themes/Shared/WindowDrawnDecorations.axaml

@@ -3,13 +3,8 @@
     <StaticResource x:Key="WindowMinimizeGlyph" ResourceKey="SemiIconMinus" />
     <StaticResource x:Key="WindowExpandGlyph" ResourceKey="SemiIconExpand" />
     <StaticResource x:Key="WindowCollapseGlyph" ResourceKey="SemiIconShrink" />
-
+    <StaticResource x:Key="WindowMaximizeGlyph" ResourceKey="SemiIconMaximize2" />
-    <StreamGeometry x:Key="WindowMaximizeGlyph">
+    <StaticResource x:Key="WindowRestoreGlyph" ResourceKey="SemiIconRestore" />
-        M5 5.5A.5.5 0 015.5 5h13a.5.5 0 01.5.5v13a.5.5 0 01-.5.5H5.5A.5.5 0 015 18.5V5.5Zm-3 0v13A3.5 3.5 0 005.5 22h13A3.5 3.5 0 0022 18.5V5A3.5 3.5 0 0018.5 2H5.5A3.5 3.5 0 002 5.5Z
-    </StreamGeometry>
-    <StreamGeometry x:Key="WindowRestoreGlyph">
-        M3 9A2 2 0 015 7H15a2 2 0 012 2V19a2 2 0 01-2 2H5A2 2 0 013 19V9Zm3 1v8h8V10H6ZM7 4c0-1.1.9-2 2-2h11a2 2 0 012 2v11a2 2 0 01-2 2h-1V5H7V4Z
-    </StreamGeometry>
 
     <StaticResource x:Key="CaptionButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
     <StaticResource x:Key="CaptionButtonWidth" ResourceKey="SemiSpacingExtraLoose" />

src/Semi.Avalonia/Tokens/Palette/Dark.axaml

@@ -584,13 +584,4 @@
     <!--  Shadow  -->
     <BoxShadows x:Key="SemiColorShadow">0 0 #0A000000</BoxShadows>
     <BoxShadows x:Key="SemiShadowElevated">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
-
-    <!-- Obsolete -->
-    <StaticResource x:Key="SemiColorPrimaryPressed" ResourceKey="SemiColorPrimaryActive" />
-    <StaticResource x:Key="SemiColorSecondaryPressed" ResourceKey="SemiColorSecondaryActive" />
-    <StaticResource x:Key="SemiColorTertiaryPressed" ResourceKey="SemiColorTertiaryActive" />
-    <StaticResource x:Key="SemiColorInformationPressed" ResourceKey="SemiColorInformationActive" />
-    <StaticResource x:Key="SemiColorSuccessPressed" ResourceKey="SemiColorSuccessActive" />
-    <StaticResource x:Key="SemiColorWarningPressed" ResourceKey="SemiColorWarningActive" />
-    <StaticResource x:Key="SemiColorDangerPressed" ResourceKey="SemiColorDangerActive" />
 </ResourceDictionary>

src/Semi.Avalonia/Tokens/Palette/Light.axaml

@@ -584,13 +584,4 @@
     <!--  Shadow  -->
     <BoxShadows x:Key="SemiColorShadow">0 0 #0A000000</BoxShadows>
     <BoxShadows x:Key="SemiShadowElevated">0 0 1 #4A000000, 0 4 14 #1A000000</BoxShadows>
-
-    <!-- Obsolete -->
-    <StaticResource x:Key="SemiColorPrimaryPressed" ResourceKey="SemiColorPrimaryActive" />
-    <StaticResource x:Key="SemiColorSecondaryPressed" ResourceKey="SemiColorSecondaryActive" />
-    <StaticResource x:Key="SemiColorTertiaryPressed" ResourceKey="SemiColorTertiaryActive" />
-    <StaticResource x:Key="SemiColorInformationPressed" ResourceKey="SemiColorInformationActive" />
-    <StaticResource x:Key="SemiColorSuccessPressed" ResourceKey="SemiColorSuccessActive" />
-    <StaticResource x:Key="SemiColorWarningPressed" ResourceKey="SemiColorWarningActive" />
-    <StaticResource x:Key="SemiColorDangerPressed" ResourceKey="SemiColorDangerActive" />
 </ResourceDictionary>