chore: bump version to 12.0.0.

Remove obsolete resources. (#792 )
Update Drawer to match upstream design (#790 )
2026-04-23 18:06:34 +08:00 · 2026-04-08 00:09:46 +08:00 · 2026-04-08 00:03:22 +08:00 · 2026-04-07 23:56:17 +08:00 · 2026-04-07 23:53:11 +08:00 · 2026-04-07 21:30:36 +08:00
34 changed files with 434 additions and 613 deletions
--- a/demo/Directory.Packages.props
+++ b/demo/Directory.Packages.props
@@ -1,8 +1,8 @@
 <Project>
    <PropertyGroup>
        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <AvaloniaVersion>12.0.0-rc2</AvaloniaVersion>
-        <DataGridVersion>12.0.0-rc2</DataGridVersion>
+        <AvaloniaVersion>12.0.0</AvaloniaVersion>
+        <DataGridVersion>12.0.0</DataGridVersion>
        <SkiaSharpVersion>3.119.3-preview.1.1</SkiaSharpVersion>
    </PropertyGroup>
    <ItemGroup>
--- a/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml
@@ -23,6 +23,13 @@
                          Content="Gesture Enabled"
                          IsChecked="True"
                          IsCheckedChanged="OnGestureChanged" />
+                
+                <ComboBox SelectionChanged="OnLayoutChanged" >
+                    <ComboBoxItem Content="CompactOverlay" />
+                    <ComboBoxItem Content="CompactInline" />
+                    <ComboBoxItem Content="Split" />
+                    <ComboBoxItem Content="Overlay" />
+                </ComboBox>

                <Separator />

@@ -35,38 +42,36 @@
        </ScrollViewer>

        <Border DockPanel.Dock="Right" Width="1" Background="{DynamicResource SemiColorBackground0}" />
-
-        <Border Margin="12"
-                BorderBrush="{DynamicResource SemiColorBorder}"
-                BorderThickness="1"
-                CornerRadius="6"
-                ClipToBounds="True">
-            <DrawerPage Name="DemoDrawer"
-                        Header="First Look"
-                        DrawerLength="250">
-                <DrawerPage.DrawerHeader>
-                    <Border Padding="16" Background="{DynamicResource SemiColorPrimary}">
-                        <TextBlock Text="Menu" FontSize="18" FontWeight="SemiBold" Foreground="{DynamicResource SemiColorText0}" />
-                    </Border>
-                </DrawerPage.DrawerHeader>
-                <DrawerPage.Drawer>
-                    <ListBox Name="DrawerMenu" SelectionChanged="OnMenuSelectionChanged">
-                        <ListBoxItem Content="Home" />
-                        <ListBoxItem Content="Settings" />
-                        <ListBoxItem Content="Profile" />
-                        <ListBoxItem Content="About" />
-                    </ListBox>
-                </DrawerPage.Drawer>
-                <DrawerPage.Content>
-                    <ContentPage Header="Home">
-                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
-                            <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."
-                                       FontSize="13" Opacity="0.7" TextWrapping="Wrap" TextAlignment="Center" MaxWidth="300" />
-                        </StackPanel>
-                    </ContentPage>
-                </DrawerPage.Content>
-            </DrawerPage>
-        </Border>
+        
+        <DrawerPage Name="DemoDrawer"
+                    Margin="12"
+                    Header="First Look"
+                    DrawerLayoutBehavior="Overlay"
+                    CompactDrawerLength="80"
+                    DrawerLength="250">
+            <DrawerPage.DrawerHeader>
+                <TextBlock Text="Menu" Margin="16" FontSize="18" FontWeight="SemiBold" Foreground="{DynamicResource SemiColorPrimary}" />
+            </DrawerPage.DrawerHeader>
+            <DrawerPage.DrawerFooter>
+                <TextBlock HorizontalAlignment="Center" Text="Powered by IRIHI" Margin="8" />
+            </DrawerPage.DrawerFooter>
+            <DrawerPage.Drawer>
+                <ListBox Name="DrawerMenu" SelectionChanged="OnMenuSelectionChanged">
+                    <ListBoxItem Content="Home" />
+                    <ListBoxItem Content="Settings" />
+                    <ListBoxItem Content="Profile" />
+                    <ListBoxItem Content="About" />
+                </ListBox>
+            </DrawerPage.Drawer>
+            <DrawerPage.Content>
+                <ContentPage Header="Home">
+                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
+                        <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."
+                                   FontSize="13" Opacity="0.7" TextWrapping="Wrap" TextAlignment="Center" MaxWidth="300" />
+                    </StackPanel>
+                </ContentPage>
+            </DrawerPage.Content>
+        </DrawerPage>
    </DockPanel>
 </UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml.cs
+++ b/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
+        };
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/NavigationPageDemo.axaml
+++ b/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>
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -1,14 +1,14 @@
 <Project>
    <PropertyGroup>
        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <AvaloniaVersion>12.0.0-rc2</AvaloniaVersion>
-        <DataGridVersion>12.0.0-rc2</DataGridVersion>
+        <AvaloniaVersion>12.0.0</AvaloniaVersion>
+        <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>
--- a/src/Semi.Avalonia/Controls/CarouselPage.axaml
+++ b/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}"
--- a/src/Semi.Avalonia/Controls/ContentPage.axaml
+++ b/src/Semi.Avalonia/Controls/ContentPage.axaml
@@ -16,28 +16,27 @@
    <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"
-                        Content="{TemplateBinding TopCommandBar}" />
-                    <ContentPresenter
-                        Name="PART_ContentPresenter"
-                        Grid.Row="1"
-                        Content="{TemplateBinding Content}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        DockPanel.Dock="Top" />
                    <ContentPresenter
                        Name="PART_BottomCommandBar"
-                        Grid.Row="2"
-                        Content="{TemplateBinding BottomCommandBar}" />
-                </Grid>
+                        DockPanel.Dock="Bottom" />
+                    <ContentPresenter
+                        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>
-</ResourceDictionary>
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/DrawerPage.axaml
+++ b/src/Semi.Avalonia/Controls/DrawerPage.axaml
@@ -1,6 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <Design.PreviewWith>
        <DrawerPage Width="400" Height="300" />
    </Design.PreviewWith>
@@ -8,142 +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}">
-
-                    <!--  Top bar with pane toggle button  -->
-                    <Border
-                        Name="PART_TopBar"
-                        Grid.Row="0"
-                        MinHeight="{DynamicResource DrawerPageTopBarMinHeight}"
-                        Padding="{DynamicResource DrawerPageTopBarPadding}"
-                        Background="{DynamicResource DrawerPageTopBarBackground}"
-                        BorderBrush="{DynamicResource DrawerPageTopBarBorderBrush}"
-                        BorderThickness="{DynamicResource DrawerPageTopBarBorderThickness}">
-                        <Grid ColumnDefinitions="Auto,Auto,*">
-                            <!--  Pane toggle button (hamburger)  -->
+                <SplitView
+                    Name="PART_SplitView"
+                    CompactPaneLength="{TemplateBinding CompactDrawerLength}"
+                    DisplayMode="{TemplateBinding DisplayMode}"
+                    IsPaneOpen="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                    OpenPaneLength="{TemplateBinding DrawerLength}"
+                    PaneBackground="{Binding DrawerBackground, RelativeSource={RelativeSource TemplatedParent}}">
+                    <SplitView.Pane>
+                        <DockPanel Background="{TemplateBinding DrawerBackground}">
+                            <!--  Compact-mode toggle: visible only in CompactOverlay/CompactInline.  -->
                            <ToggleButton
-                                Name="PART_PaneButton"
-                                Grid.Column="0"
-                                Width="{DynamicResource DrawerPagePaneButtonSize}"
-                                Height="{DynamicResource DrawerPagePaneButtonSize}"
-                                Margin="{DynamicResource DrawerPagePaneButtonMargin}"
-                                VerticalAlignment="Center"
-                                Background="{DynamicResource DrawerPagePaneButtonBackground}"
-                                Foreground="{DynamicResource DrawerPagePaneButtonForeground}"
-                                IsChecked="{TemplateBinding IsOpen, Mode=TwoWay}">
-                                <PathIcon
-                                    Width="16"
-                                    Height="16"
-                                    Data="{DynamicResource DrawerPageMenuGlyph}"
-                                    Foreground="{DynamicResource DrawerPagePaneButtonForeground}" />
-                            </ToggleButton>
-
-                            <!--  Drawer icon (shown in top bar)  -->
-                            <ContentPresenter
-                                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}"
-                                        ContentTemplate="{TemplateBinding DrawerHeaderTemplate}" />
-
-                                    <!--  Drawer footer  -->
-                                    <ContentPresenter
-                                        Name="PART_DrawerFooter"
-                                        DockPanel.Dock="Bottom"
-                                        Background="{TemplateBinding DrawerFooterBackground}"
-                                        Content="{TemplateBinding DrawerFooter}"
-                                        ContentTemplate="{TemplateBinding DrawerFooterTemplate}" />
-
-                                    <!--  Compact pane icon (compact mode)  -->
+                                Name="PART_CompactPaneToggle"
+                                Width="{DynamicResource ButtonDefaultHeight}"
+                                Height="{DynamicResource ButtonDefaultHeight}"
+                                HorizontalAlignment="Left"
+                                AutomationProperties.Name="Toggle navigation drawer"
+                                Background="Transparent"
+                                DockPanel.Dock="Top"
+                                IsChecked="{Binding #PART_SplitView.IsPaneOpen, Mode=TwoWay}"
+                                IsVisible="False"
+                                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_CompactPaneIconPresenter"
-                                        DockPanel.Dock="Top"
-                                        IsVisible="False"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
                                        Content="{TemplateBinding DrawerIcon}"
-                                        ContentTemplate="{TemplateBinding DrawerIconTemplate}" />
-
-                                    <!--  Bottom pane icon  -->
-                                    <ContentPresenter
-                                        Name="PART_BottomPaneIconPresenter"
-                                        DockPanel.Dock="Bottom"
-                                        IsVisible="False" 
-                                        Content="{TemplateBinding DrawerIcon}"
-                                        ContentTemplate="{TemplateBinding DrawerIconTemplate}" />
-
-                                    <!--  Drawer main content  -->
-                                    <ContentPresenter
-                                        Name="PART_DrawerPresenter"
-                                        Content="{TemplateBinding Drawer}"
-                                        ContentTemplate="{TemplateBinding DrawerTemplate}" />
+                                        ContentTemplate="{TemplateBinding DrawerIconTemplate}"
+                                        Foreground="{DynamicResource DrawerPagePaneButtonForeground}"
+                                        IsVisible="{TemplateBinding DrawerIcon, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                </Panel>
+                            </ToggleButton>
+                            <ContentPresenter
+                                Name="PART_DrawerHeader"
+                                Background="{TemplateBinding DrawerHeaderBackground}"
+                                Content="{TemplateBinding DrawerHeader}"
+                                ContentTemplate="{TemplateBinding DrawerHeaderTemplate}"
+                                DockPanel.Dock="Top"
+                                IsVisible="{TemplateBinding DrawerHeader,
+                                                            Converter={x:Static ObjectConverters.IsNotNull}}" />
+                            <ContentPresenter
+                                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>
-
-                            <!--  Main page content  -->
+                            </Border>
+                            <Border
+                                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}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-                        </SplitView>
-
-                        <!--  Backdrop overlay (shown in overlay/flyout modes)  -->
+                                CornerRadius="{TemplateBinding CornerRadius}" />
+                        </DockPanel>
                        <Border
                            Name="PART_Backdrop"
                            Background="{TemplateBinding BackdropBrush}"
                            IsHitTestVisible="False"
                            IsVisible="False" />
-
-                        <!--  Compact pane toggle  -->
-                        <ToggleButton
-                            Name="PART_CompactPaneToggle"
-                            IsVisible="False" />
-                    </Panel>
-                </Grid>
+                    </Grid>
+                </SplitView>
            </ControlTemplate>
        </Setter>

-        <!--  Pseudo-class: right-side drawer  -->
-        <Style Selector="^:placement-right /template/ SplitView#PART_SplitView">
-            <Setter Property="PanePlacement" Value="Right" />
+        <Style Selector="^:placement-right /template/ ToggleButton#PART_PaneButton">
+            <Setter Property="DockPanel.Dock" Value="Right" />
        </Style>

-        <!--  Pseudo-class: top drawer  -->
-        <Style Selector="^:placement-top /template/ SplitView#PART_SplitView">
-            <Setter Property="PanePlacement" Value="Top" />
+        <!--  Bottom placement: swap top bar for bottom bar  -->
+        <Style Selector="^:placement-bottom /template/ Border#PART_TopBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^:placement-bottom /template/ Border#PART_BottomBar">
+            <Setter Property="IsVisible" Value="True" />
        </Style>

-        <!--  Pseudo-class: bottom drawer  -->
-        <Style Selector="^:placement-bottom /template/ SplitView#PART_SplitView">
-            <Setter Property="PanePlacement" Value="Bottom" />
+        <!--  Bottom placement + compact modes: pane compact strip provides toggle, hide bottom bar  -->
+        <Style Selector="^:placement-bottom[DisplayMode=CompactOverlay] /template/ Border#PART_BottomBar">
+            <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>
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/NavigationPage.axaml
+++ b/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="Foreground" Value="{DynamicResource NavigationPageForeground}" />
+        <Setter Property="Background" Value="Transparent" />
        <Setter Property="BarHeight" Value="{DynamicResource NavigationPageBarMinHeight}" />
        <Setter Property="Template">
            <ControlTemplate TargetType="NavigationPage">
-                <Grid RowDefinitions="Auto,*,Auto" Background="{TemplateBinding Background}">
-                    <!--  Top command bar  -->
-                    <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)  -->
+                <Panel ClipToBounds="True">
+                    <DockPanel>
                        <Border
-                            Name="PART_NavigationBar"
-                            MinHeight="{TemplateBinding BarHeight}"
-                            Padding="{DynamicResource NavigationPageBarPadding}"
-                            VerticalAlignment="Top"
-                            Background="{DynamicResource NavigationPageBarBackground}"
-                            BorderBrush="{DynamicResource NavigationPageBarBorderBrush}"
-                            BorderThickness="{DynamicResource NavigationPageBarBorderThickness}">
-                            <Grid ColumnDefinitions="Auto,*,Auto">
-                                <Button
-                                    Name="PART_BackButton"
-                                    Grid.Column="0"
-                                    MinHeight="{DynamicResource NavigationPageBarMinHeight}"
-                                    MinWidth="{DynamicResource NavigationPageBarMinHeight}"
-                                    Padding="8"
-                                    VerticalAlignment="Center"
-                                    IsVisible="{TemplateBinding IsBackButtonEffectivelyVisible}"
-                                    Background="{DynamicResource NavigationPageBackButtonBackground}"
-                                    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>
+                            Name="PART_NavBarSpacer"
+                            Height="{TemplateBinding EffectiveBarHeight}"
+                            IsVisible="False"
+                            DockPanel.Dock="Top" />
+                        <ContentPresenter
+                            Name="PART_BottomCommandBar"
+                            DockPanel.Dock="Bottom"
+                            Background="{TemplateBinding Background}"
+                            Content="{Binding CurrentPage.(NavigationPage.BottomCommandBar), RelativeSource={RelativeSource TemplatedParent}, FallbackValue={x:Null}}" />
+                        <Panel
+                            Name="PART_ContentHost"
+                            Background="{TemplateBinding Background}"
+                            ClipToBounds="True">
+                            <ContentPresenter Name="PART_PageBackPresenter" />
+                            <ContentPresenter Name="PART_PagePresenter" />
+                        </Panel>
+                    </DockPanel>

-                    <!--  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"
-                        Grid.Row="2" />
-                </Grid>
+                        Name="PART_ModalBackPresenter"
+                        ZIndex="99"
+                        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="^:nav-bar-inset /template/ Border#PART_NavigationBar">
-            <Setter Property="BorderThickness" Value="0" />
+        <Style Selector="^ /template/ Border#PART_NavigationBar">
+            <Setter Property="Background" Value="{DynamicResource NavigationBarBackground}" />
        </Style>

-        <!--  Compact navigation bar  -->
-        <Style Selector="^:nav-bar-compact /template/ Border#PART_NavigationBar">
-            <Setter Property="MinHeight" Value="0" />
+        <Style Selector="^:nav-bar-inset /template/ Border#PART_NavBarSpacer">
+            <Setter Property="IsVisible" Value="True" />
+        </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>
--- a/src/Semi.Avalonia/Controls/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Controls/ProgressBar.axaml
@@ -154,10 +154,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="^:horizontal">
            <Setter Property="MinWidth" Value="200" />
@@ -385,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>
--- a/src/Semi.Avalonia/Controls/SplitView.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Controls/TabbedPage.axaml
+++ b/src/Semi.Avalonia/Controls/TabbedPage.axaml
@@ -11,8 +11,7 @@
                <TabControl
                    Name="PART_TabControl"
                    Background="{TemplateBinding Background}"
-                    Theme="{StaticResource LineTabControl}"
-                    ItemsSource="{TemplateBinding Pages}" />
+                    Theme="{StaticResource LineTabControl}" />
            </ControlTemplate>
        </Setter>
    </ControlTheme>
@@ -22,8 +21,7 @@
                <TabControl
                    Name="PART_TabControl"
                    Background="{TemplateBinding Background}"
-                    Theme="{StaticResource CardTabControl}"
-                    ItemsSource="{TemplateBinding Pages}" />
+                    Theme="{StaticResource CardTabControl}" />
            </ControlTemplate>
        </Setter>
    </ControlTheme>
@@ -33,8 +31,7 @@
                <TabControl
                    Name="PART_TabControl"
                    Background="{TemplateBinding Background}"
-                    Theme="{StaticResource ButtonTabControl}"
-                    ItemsSource="{TemplateBinding Pages}" />
+                    Theme="{StaticResource ButtonTabControl}" />
            </ControlTemplate>
        </Setter>
    </ControlTheme>
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -81,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)}"
@@ -319,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)}"
@@ -544,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)}"
--- a/src/Semi.Avalonia/Icons/FillIcons.axaml
+++ b/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
--- a/src/Semi.Avalonia/Icons/StrokedIcons.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Semi.Avalonia.csproj
+++ b/src/Semi.Avalonia/Semi.Avalonia.csproj
@@ -2,8 +2,8 @@

    <PropertyGroup>
        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
-        <Version>12.0.0-rc2</Version>
-        <PackageReleaseNotes>Update to Semi.Avalonia 12.0.0-rc2</PackageReleaseNotes>
+        <Version>12.0.0</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia 12.0.0</PackageReleaseNotes>
        <Title>Semi.Avalonia</Title>
    </PropertyGroup>

--- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Themes/Dark/DrawerPage.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Themes/Dark/Label.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Themes/Dark/NavigationPage.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
@@ -9,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>
--- a/src/Semi.Avalonia/Themes/HighContrast/CheckBox.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Themes/HighContrast/DrawerPage.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Themes/HighContrast/NavigationPage.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Themes/Light/DrawerPage.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Themes/Light/Label.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Themes/Light/NavigationPage.axaml
+++ b/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>
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
@@ -9,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>
--- a/src/Semi.Avalonia/Themes/Shared/DrawerPage.axaml
+++ b/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>
-    <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>
+    <x:Double x:Key="DrawerPageTopBarMinHeight">32</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>
--- a/src/Semi.Avalonia/Themes/Shared/NavigationPage.axaml
+++ b/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" />
--- a/src/Semi.Avalonia/Themes/Shared/WindowDrawnDecorations.axaml
+++ b/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" />
-
-    <StreamGeometry x:Key="WindowMaximizeGlyph">
-        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="WindowMaximizeGlyph" ResourceKey="SemiIconMaximize2" />
+    <StaticResource x:Key="WindowRestoreGlyph" ResourceKey="SemiIconRestore" />

    <StaticResource x:Key="CaptionButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
    <StaticResource x:Key="CaptionButtonWidth" ResourceKey="SemiSpacingExtraLoose" />
--- a/src/Semi.Avalonia/Tokens/Palette/Dark.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Tokens/Palette/Light.axaml
+++ b/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>
Author	SHA1	Message	Date
Zhang Dian	6eaa47e7ce	chore: bump version to 12.0.0.	2026-04-08 00:09:46 +08:00
Zhang Dian	1edc65c091	Remove obsolete resources. (#792 )	2026-04-08 00:03:22 +08:00
Dong Bin	1348149957	Update Drawer to match upstream design (#790 ) * 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>	2026-04-07 23:56:17 +08:00
Zhang Dian	3b4443cd54	Fix CarouselPage ControlTemplate and sync NavigationPage template (#791 ) * fix: specify TargetType in ControlTemplate for CarouselPage and remove redundant ItemsSource bindings in TabbedPage. * feat: sync ContentPage with Avalonia Fluent version. * fix: sync upstream NavigationPage template. * feat: adjust NavigationPage bar height and add large style support * feat: add ToggleSwitch for large style support in NavigationPageDemo --------- Co-authored-by: Dong Bin <popmessiah@hotmail.com>	2026-04-07 23:53:11 +08:00
Zhang Dian	35bea6ff1f	feat: add maximize2 and restore icons.	2026-04-07 21:30:36 +08:00
Zhang Dian	c393d41112	chore: upgrade version to Avalonia 12.0.0.	2026-04-07 21:29:32 +08:00
Zhang Dian	d4c4ef1dba	Merge branch '12.0.0-rc2'	2026-04-07 21:14:20 +08:00
Copilot	77dffc55b1	Sync 45 new icons from Semi Design commit ba384587 (#761 ) * Initial plan * Sync 45 new icons from Semi Design commit ba384587 Co-authored-by: zdpcdt <54255897+zdpcdt@users.noreply.github.com> * fix: correct geometry paths for Semi icons. * fix: update EyeClosedSolidStroked & IconHornStroked paths for Semi icons in StrokedIcons.axaml. * fix: resolve copilot review. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: zdpcdt <54255897+zdpcdt@users.noreply.github.com>	2026-03-10 14:42:21 +08:00
Gehongyan	3ba357b691	Fix TextBox MaxLines property not constraining height in Semi theme (#753 ) * Initial plan * Fix TextBox MaxLines property by adding Name=PART_ScrollViewer to ScrollViewer elements Co-authored-by: gehongyan <21241496+gehongyan@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>	2026-03-05 23:16:29 +08:00