chore: bump version to 12.0.0-rc2.

Sync Avalonia 12.0.0-rc2 changes (#786 )
* chore: AppBar -> CommanrBar. * feat: Add keyboard navigation for overflow CommandBar popup. * chore: Style -> Theme in PipsPager. * chore: add Header/Footer templates to DrawerPage. * feaa: hide caption buttons when the platform does not support the action. * feat: Touch Improvements to TextBox. * chore: remove Opacity from PART_Placeholder. * feat: enable access key recognition for GroupBox. * feat: limit label text to a single line in CommandBar.
2026-04-23 09:56:35 +08:00 · 2026-04-07 11:56:21 +08:00 · 2026-04-01 23:01:45 +08:00 · 2026-04-01 18:05:01 +08:00 · 2026-04-01 11:28:01 +08:00
20 changed files with 405 additions and 364 deletions
--- a/demo/Directory.Packages.props
+++ b/demo/Directory.Packages.props
@@ -1,9 +1,9 @@
 <Project>
    <PropertyGroup>
        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <AvaloniaVersion>12.0.0-rc1</AvaloniaVersion>
-        <DataGridVersion>12.0.0-rc1</DataGridVersion>
-        <SkiaSharpVersion>3.119.1</SkiaSharpVersion>
+        <AvaloniaVersion>12.0.0-rc2</AvaloniaVersion>
+        <DataGridVersion>12.0.0-rc2</DataGridVersion>
+        <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>
--- a/demo/Semi.Avalonia.Demo/Pages/CommandBarDemo.axaml
+++ b/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}" />
-                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
-                    <AppBarSeparator />
-                    <AppBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
-                    <AppBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
-                    <AppBarToggleButton IsChecked="True" IsEnabled="False" Label="Underline" Icon="{DynamicResource SemiIconUnderline}" />
-                    <AppBarSeparator />
-                    <AppBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
-                    <AppBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
-                    <AppBarButton Label="Print" Icon="{DynamicResource SemiIconPrint}" />
-                    <AppBarSeparator />
-                    <AppBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
+                    <CommandBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
+                    <CommandBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
+                    <CommandBarSeparator />
+                    <CommandBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
+                    <CommandBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
+                    <CommandBarToggleButton IsChecked="True" IsEnabled="False" Label="Underline" Icon="{DynamicResource SemiIconUnderline}" />
+                    <CommandBarSeparator />
+                    <CommandBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
+                    <CommandBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
+                    <CommandBarButton Label="Print" Icon="{DynamicResource SemiIconPrint}" />
+                    <CommandBarSeparator />
+                    <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}" />
-                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
-                    <AppBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
+                    <CommandBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
+                    <CommandBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
+                    <CommandBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
                    <CommandBar.SecondaryCommands>
-                        <AppBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
-                        <AppBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
+                        <CommandBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
+                        <CommandBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
                    </CommandBar.SecondaryCommands>
                </CommandBar>
            </GroupBox>
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -1,8 +1,8 @@
 <Project>
    <PropertyGroup>
        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <AvaloniaVersion>12.0.0-rc1</AvaloniaVersion>
-        <DataGridVersion>12.0.0-rc1</DataGridVersion>
+        <AvaloniaVersion>12.0.0-rc2</AvaloniaVersion>
+        <DataGridVersion>12.0.0-rc2</DataGridVersion>
    </PropertyGroup>
    <ItemGroup>
        <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)"/>
--- a/src/Semi.Avalonia/Controls/CommandBar.axaml
+++ b/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}" />
-                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
-                    <AppBarSeparator />
-                    <AppBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
-                    <AppBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
-                    <AppBarToggleButton IsEnabled="False" IsChecked="True" Label="Underline" Icon="{DynamicResource SemiIconUnderline}" />
-                    <AppBarSeparator />
-                    <AppBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
-                    <AppBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
-                    <AppBarButton Label="Print" Icon="{DynamicResource SemiIconPrint}" />
-                    <AppBarSeparator />
-                    <AppBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
+                    <CommandBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
+                    <CommandBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
+                    <CommandBarSeparator />
+                    <CommandBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
+                    <CommandBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
+                    <CommandBarToggleButton IsEnabled="False" IsChecked="True" Label="Underline" Icon="{DynamicResource SemiIconUnderline}" />
+                    <CommandBarSeparator />
+                    <CommandBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
+                    <CommandBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
+                    <CommandBarButton Label="Print" Icon="{DynamicResource SemiIconPrint}" />
+                    <CommandBarSeparator />
+                    <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="Foreground" Value="{DynamicResource AppBarButtonForeground}" />
+        <Setter Property="Background" Value="{DynamicResource CommandBarButtonBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource CommandBarButtonForeground}" />
        <Setter Property="BorderBrush" Value="Transparent" />
        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Padding" Value="{DynamicResource AppBarButtonPadding}" />
-        <Setter Property="Width" Value="{DynamicResource AppBarButtonWidth}" />
-        <Setter Property="MinHeight" Value="{DynamicResource AppBarButtonMinHeight}" />
+        <Setter Property="Padding" Value="{DynamicResource CommandBarButtonPadding}" />
+        <Setter Property="Width" Value="{DynamicResource CommandBarButtonWidth}" />
+        <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}"
-        BasedOn="{StaticResource AppBarButtonBaseTheme}"
-        TargetType="AppBarButton">
+        x:Key="{x:Type CommandBarButton}"
+        BasedOn="{StaticResource CommandBarButtonBaseTheme}"
+        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="Padding" Value="{DynamicResource AppBarButtonOverflowPadding}" />
+            <Setter Property="MinHeight" Value="{DynamicResource CommandBarButtonOverflowMinHeight}" />
+            <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}"
-        BasedOn="{StaticResource AppBarButtonBaseTheme}"
-        TargetType="AppBarToggleButton">
+        x:Key="{x:Type CommandBarToggleButton}"
+        BasedOn="{StaticResource CommandBarButtonBaseTheme}"
+        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="Padding" Value="{DynamicResource AppBarButtonOverflowPadding}" />
+            <Setter Property="MinHeight" Value="{DynamicResource CommandBarButtonOverflowMinHeight}" />
+            <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  -->
-    <ControlTheme x:Key="{x:Type AppBarSeparator}" TargetType="AppBarSeparator">
-        <Setter Property="Background" Value="{DynamicResource AppBarSeparatorBackground}" />
-        <Setter Property="Width" Value="{DynamicResource AppBarSeparatorWidth}" />
-        <Setter Property="MinHeight" Value="{DynamicResource AppBarSeparatorMinHeight}" />
-        <Setter Property="Margin" Value="{DynamicResource AppBarSeparatorMargin}" />
+    <!--  CommandBarSeparator  -->
+    <ControlTheme x:Key="{x:Type CommandBarSeparator}" TargetType="CommandBarSeparator">
+        <Setter Property="Background" Value="{DynamicResource CommandBarSeparatorBackground}" />
+        <Setter Property="Width" Value="{DynamicResource CommandBarSeparatorWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource CommandBarSeparatorMinHeight}" />
+        <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>
--- a/src/Semi.Avalonia/Controls/DrawerPage.axaml
+++ b/src/Semi.Avalonia/Controls/DrawerPage.axaml
@@ -71,14 +71,16 @@
                                        Name="PART_DrawerHeader"
                                        DockPanel.Dock="Top"
                                        Background="{TemplateBinding DrawerHeaderBackground}"
-                                        Content="{TemplateBinding DrawerHeader}" />
+                                        Content="{TemplateBinding DrawerHeader}"
+                                        ContentTemplate="{TemplateBinding DrawerHeaderTemplate}" />

                                    <!--  Drawer footer  -->
                                    <ContentPresenter
                                        Name="PART_DrawerFooter"
                                        DockPanel.Dock="Bottom"
                                        Background="{TemplateBinding DrawerFooterBackground}"
-                                        Content="{TemplateBinding DrawerFooter}" />
+                                        Content="{TemplateBinding DrawerFooter}"
+                                        ContentTemplate="{TemplateBinding DrawerFooterTemplate}" />

                                    <!--  Compact pane icon (compact mode)  -->
                                    <ContentPresenter
--- a/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Controls/PipsPager.axaml
+++ b/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="NextButtonStyle" Value="{StaticResource PipsPagerButton}" />
+        <Setter Property="PreviousButtonTheme" 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}" />
--- a/src/Semi.Avalonia/Controls/ProgressBar.axaml
+++ b/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">
-            <ProgressBar
-                Width="200"
-                Maximum="100"
-                Minimum="0"
-                ShowProgressText="True"
-                Value="20" />
-            <ProgressBar
-                Width="200"
-                IsIndeterminate="True"
-                Maximum="100"
-                Minimum="0"
-                ShowProgressText="True"
-                Value="20" />
-            <ProgressBar
-                Width="200"
-                Classes="Left"
-                IsIndeterminate="True"
-                Maximum="100"
-                Minimum="0"
-                ShowProgressText="True"
-                Value="20" />
-            <ProgressBar
-                Width="200"
-                Classes="Left"
-                Maximum="100"
-                Minimum="0"
-                ShowProgressText="True"
-                Value="20" />
-            <ProgressBar
-                Width="200"
-                Classes="Right"
-                Maximum="100"
-                Minimum="0"
-                ShowProgressText="True"
-                Value="20" />
-            <StackPanel
-                HorizontalAlignment="Left"
-                Orientation="Horizontal"
-                Spacing="20">
-                <ProgressBar
-                    Classes="Left"
-                    Maximum="100"
-                    Minimum="0"
-                    Orientation="Vertical"
-                    ShowProgressText="True"
-                    Value="20" />
-                <ProgressBar
-                    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 Width="400" Margin="20">
+            <ProgressBar />
+            <ProgressBar Value="20" />
+            <ProgressBar Value="50" Classes="Success" />
+            <ProgressBar Value="80" Classes="Warning" />
+            <ProgressBar Value="100" Classes="Error" />
+            <ProgressBar ShowProgressText="True" />
+            <ProgressBar Value="20" ShowProgressText="True" />
+            <ProgressBar Value="50" Classes="Success" ShowProgressText="True" />
+            <ProgressBar Value="80" Classes="Warning" ShowProgressText="True" />
+            <ProgressBar Value="100" Classes="Error" ShowProgressText="True" />
+            <ProgressBar Classes="Left" ShowProgressText="True" />
+            <ProgressBar Value="20" Classes="Left" ShowProgressText="True" />
+            <ProgressBar Value="50" Classes="Left Success" ShowProgressText="True" />
+            <ProgressBar Value="80" Classes="Left Warning" ShowProgressText="True" />
+            <ProgressBar Value="100" Classes="Left Error" ShowProgressText="True" />
+            <ProgressBar Classes="Right" ShowProgressText="True" />
+            <ProgressBar Value="20" Classes="Right" ShowProgressText="True" />
+            <ProgressBar Value="50" Classes="Right Success" ShowProgressText="True" />
+            <ProgressBar Value="80" Classes="Right Warning" ShowProgressText="True" />
+            <ProgressBar Value="100" Classes="Right Error" ShowProgressText="True" />
+
+            <StackPanel Orientation="Horizontal">
+                <StackPanel.Styles>
+                    <Style Selector="ProgressBar">
+                        <Setter Property="Orientation" Value="Vertical" />
+                    </Style>
+                </StackPanel.Styles>
+                <ProgressBar />
+                <ProgressBar Value="20" />
+                <ProgressBar Value="50" Classes="Success" />
+                <ProgressBar Value="80" Classes="Warning" />
+                <ProgressBar Value="100" Classes="Error" />
+                <ProgressBar ShowProgressText="True" />
+                <ProgressBar Value="20" ShowProgressText="True" />
+                <ProgressBar Value="50" Classes="Success" ShowProgressText="True" />
+                <ProgressBar Value="80" Classes="Warning" ShowProgressText="True" />
+                <ProgressBar Value="100" Classes="Error" ShowProgressText="True" />
+                <ProgressBar Classes="Top" ShowProgressText="True" />
+                <ProgressBar Value="20" Classes="Top" ShowProgressText="True" />
+                <ProgressBar Value="50" Classes="Top Success" ShowProgressText="True" />
+                <ProgressBar Value="80" Classes="Top Warning" ShowProgressText="True" />
+                <ProgressBar Value="100" Classes="Top Error" ShowProgressText="True" />
+                <ProgressBar Classes="Bottom" ShowProgressText="True" />
+                <ProgressBar Value="20" Classes="Bottom" ShowProgressText="True" />
+                <ProgressBar Value="50" Classes="Bottom Success" ShowProgressText="True" />
+                <ProgressBar Value="80" Classes="Bottom Warning" ShowProgressText="True" />
+                <ProgressBar Value="100" Classes="Bottom Error" ShowProgressText="True" />
            </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" />
@@ -191,149 +158,155 @@
        <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="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
-            <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 Selector="^ /template/ Border#PART_Indicator">
+                <Setter Property="VerticalAlignment" Value="Top" />
            </Style>
-            <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
-                <Setter Property="Grid.Column" Value="1" />
-                <Setter Property="Grid.Row" Value="0" />
-                <Setter Property="Margin" Value="0 4" />
+            <Style Selector="^ /template/ Border#IndeterminateProgressBarIndicator">
+                <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerWidth}" />
            </Style>
-            <Style Selector="^:horizontal /template/ Border#ProgressBarRoot">
-                <Setter Property="MinHeight" Value="4" />
-                <Setter Property="VerticalAlignment" Value="Center" />
+            <Style Selector="^ /template/ Border#IndeterminateProgressBarIndicator2">
+                <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2Width}" />
            </Style>
-            <Style Selector="^:vertical /template/ Border#ProgressBarRoot">
-                <Setter Property="MinWidth" Value="4" />
-                <Setter Property="HorizontalAlignment" Value="Center" />
+            <Style Selector="^.Left,^.Top">
+                <Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransformControl">
+                    <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">
-                <Setter Property="Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
+            <Style Selector="^.Right,^.Bottom">
+                <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">
-                <Setter Property="Grid.Column" Value="2" />
-                <Setter Property="Grid.Row" Value="1" />
-                <Setter Property="Margin" Value="4 0" />
+
+        <Style Selector="^:indeterminate">
+            <Style Selector="^ /template/ Panel#DeterminateRoot">
+                <Setter Property="Opacity" Value="0" />
            </Style>
-            <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
-                <Setter Property="Grid.Column" Value="1" />
-                <Setter Property="Grid.Row" Value="2" />
-                <Setter Property="Margin" Value="0 4" />
+            <Style Selector="^ /template/ Panel#IndeterminateRoot">
+                <Setter Property="Opacity" Value="1" />
            </Style>
-            <Style Selector="^:horizontal /template/ Border#ProgressBarRoot">
-                <Setter Property="MinHeight" Value="4" />
-                <Setter Property="VerticalAlignment" Value="Center" />
+            <Style Selector="^:horizontal /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="^:vertical /template/ Border#ProgressBarRoot">
-                <Setter Property="MinWidth" Value="4" />
-                <Setter Property="HorizontalAlignment" Value="Center" />
+            <Style Selector="^:horizontal /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="^ /template/ TextBlock#PART_ProgressText">
-                <Setter Property="Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
+            <Style Selector="^:vertical /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 /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>
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/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}" />
@@ -133,6 +154,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}" />
@@ -304,7 +329,6 @@
                                        Name="PART_Placeholder"
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                        Opacity="0.5"
                                        Foreground="{TemplateBinding PlaceholderForeground}"
                                        Text="{TemplateBinding PlaceholderText}"
                                        TextAlignment="{TemplateBinding TextAlignment}"
@@ -368,6 +392,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}" />
@@ -526,7 +554,6 @@
                                    Name="PART_Placeholder"
                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Opacity="0.5"
                                    Foreground="{TemplateBinding PlaceholderForeground}"
                                    Text="{TemplateBinding PlaceholderText}"
                                    TextAlignment="{TemplateBinding TextAlignment}"
@@ -573,6 +600,10 @@
            </ControlTemplate>
        </Setter>

+        <Style Selector="^:touch-mode">
+            <Setter Property="ContextFlyout" Value="{StaticResource HorizontalTextBoxContextFlyout}" />
+        </Style>
+
        <Style Selector="^:disabled">
            <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
        </Style>
--- a/src/Semi.Avalonia/Controls/WindowDrawnDecorations.axaml
+++ b/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">
--- 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-rc1</Version>
-        <PackageReleaseNotes>Update to Semi.Avalonia 12.0.0-rc1</PackageReleaseNotes>
+        <Version>12.0.0-rc2</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia 12.0.0-rc2</PackageReleaseNotes>
        <Title>Semi.Avalonia</Title>
    </PropertyGroup>

--- a/src/Semi.Avalonia/Themes/Dark/CommandBar.axaml
+++ b/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  -->
-    <SolidColorBrush x:Key="AppBarButtonBackground" Color="Transparent" />
-    <StaticResource x:Key="AppBarButtonForeground" ResourceKey="SemiColorText0" />
-    <StaticResource x:Key="AppBarButtonPointeroverBackground" ResourceKey="SemiColorFill0" />
-    <StaticResource x:Key="AppBarButtonPressedBackground" ResourceKey="SemiColorFill1" />
-    <StaticResource x:Key="AppBarButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
-    <!--  AppBarToggleButton checked state  -->
-    <StaticResource x:Key="AppBarToggleButtonCheckedForeground" ResourceKey="SemiColorPrimary" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedBackground" ResourceKey="SemiColorPrimaryLight" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedPointeroverBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedPressedBackground" ResourceKey="SemiColorPrimaryLightActive" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorPrimaryDisabled" />
-    <!--  AppBarSeparator  -->
-    <StaticResource x:Key="AppBarSeparatorBackground" ResourceKey="SemiColorBorder" />
+    <!--  CommandBarButton / CommandBarToggleButton  -->
+    <SolidColorBrush x:Key="CommandBarButtonBackground" Color="Transparent" />
+    <StaticResource x:Key="CommandBarButtonForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CommandBarButtonPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CommandBarButtonPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CommandBarButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <!--  CommandBarToggleButton checked state  -->
+    <StaticResource x:Key="CommandBarToggleButtonCheckedForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedPointeroverBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedPressedBackground" ResourceKey="SemiColorPrimaryLightActive" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorPrimaryDisabled" />
+    <!--  CommandBarSeparator  -->
+    <StaticResource x:Key="CommandBarSeparatorBackground" ResourceKey="SemiColorBorder" />
    <!--  CommandBar  -->
    <StaticResource x:Key="CommandBarBackground" ResourceKey="SemiColorBackground1" />
    <StaticResource x:Key="CommandBarForeground" ResourceKey="SemiColorText0" />
--- a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
+++ b/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" />
--- a/src/Semi.Avalonia/Themes/HighContrast/CommandBar.axaml
+++ b/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  -->
-    <SolidColorBrush x:Key="AppBarButtonBackground" Color="Transparent" />
-    <StaticResource x:Key="AppBarButtonForeground" ResourceKey="SemiColorWindowText" />
-    <StaticResource x:Key="AppBarButtonPointeroverBackground" ResourceKey="SemiColorHighlight" />
-    <StaticResource x:Key="AppBarButtonPressedBackground" ResourceKey="SemiColorHighlight" />
-    <StaticResource x:Key="AppBarButtonDisabledForeground" ResourceKey="SemiColorGrayText" />
-    <!--  AppBarToggleButton checked state  -->
-    <StaticResource x:Key="AppBarToggleButtonCheckedForeground" ResourceKey="SemiColorHighlightText" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedBackground" ResourceKey="SemiColorHighlight" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedPointeroverBackground" ResourceKey="SemiColorButtonText" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedPressedBackground" ResourceKey="SemiColorButtonFace" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorGrayText" />
-    <!--  AppBarSeparator  -->
-    <StaticResource x:Key="AppBarSeparatorBackground" ResourceKey="SemiColorWindowText" />
+    <!--  CommandBarButton / CommandBarToggleButton  -->
+    <SolidColorBrush x:Key="CommandBarButtonBackground" Color="Transparent" />
+    <StaticResource x:Key="CommandBarButtonForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="CommandBarButtonPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CommandBarButtonPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CommandBarButtonDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <!--  CommandBarToggleButton checked state  -->
+    <StaticResource x:Key="CommandBarToggleButtonCheckedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedPointeroverBackground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedPressedBackground" ResourceKey="SemiColorButtonFace" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <!--  CommandBarSeparator  -->
+    <StaticResource x:Key="CommandBarSeparatorBackground" ResourceKey="SemiColorWindowText" />
    <!--  CommandBar  -->
    <StaticResource x:Key="CommandBarBackground" ResourceKey="SemiColorWindow" />
    <StaticResource x:Key="CommandBarForeground" ResourceKey="SemiColorWindowText" />
--- a/src/Semi.Avalonia/Themes/HighContrast/ProgressBar.axaml
+++ b/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>
--- a/src/Semi.Avalonia/Themes/Light/CommandBar.axaml
+++ b/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  -->
-    <SolidColorBrush x:Key="AppBarButtonBackground" Color="Transparent" />
-    <StaticResource x:Key="AppBarButtonForeground" ResourceKey="SemiColorText0" />
-    <StaticResource x:Key="AppBarButtonPointeroverBackground" ResourceKey="SemiColorFill0" />
-    <StaticResource x:Key="AppBarButtonPressedBackground" ResourceKey="SemiColorFill1" />
-    <StaticResource x:Key="AppBarButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
-    <!--  AppBarToggleButton checked state  -->
-    <StaticResource x:Key="AppBarToggleButtonCheckedForeground" ResourceKey="SemiColorPrimary" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedBackground" ResourceKey="SemiColorPrimaryLight" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedPointeroverBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedPressedBackground" ResourceKey="SemiColorPrimaryLightActive" />
-    <StaticResource x:Key="AppBarToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorPrimaryDisabled" />
-    <!--  AppBarSeparator  -->
-    <StaticResource x:Key="AppBarSeparatorBackground" ResourceKey="SemiColorBorder" />
+    <!--  CommandBarButton / CommandBarToggleButton  -->
+    <SolidColorBrush x:Key="CommandBarButtonBackground" Color="Transparent" />
+    <StaticResource x:Key="CommandBarButtonForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CommandBarButtonPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CommandBarButtonPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CommandBarButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <!--  CommandBarToggleButton checked state  -->
+    <StaticResource x:Key="CommandBarToggleButtonCheckedForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedPointeroverBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedPressedBackground" ResourceKey="SemiColorPrimaryLightActive" />
+    <StaticResource x:Key="CommandBarToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorPrimaryDisabled" />
+    <!--  CommandBarSeparator  -->
+    <StaticResource x:Key="CommandBarSeparatorBackground" ResourceKey="SemiColorBorder" />
    <!--  CommandBar  -->
    <StaticResource x:Key="CommandBarBackground" ResourceKey="SemiColorBackground1" />
    <StaticResource x:Key="CommandBarForeground" ResourceKey="SemiColorText0" />
--- a/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
+++ b/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" />
--- a/src/Semi.Avalonia/Themes/Shared/CommandBar.axaml
+++ b/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  -->
-    <x:Double x:Key="AppBarButtonWidth">64</x:Double>
-    <x:Double x:Key="AppBarButtonCompactWidth">40</x:Double>
-    <x:Double x:Key="AppBarButtonMinHeight">40</x:Double>
-    <Thickness x:Key="AppBarButtonPadding">8 4</Thickness>
-    <x:Double x:Key="AppBarButtonPanelSpacing">4</x:Double>
-    <StaticResource x:Key="AppBarButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
-    <StaticResource x:Key="AppBarButtonLabelFontSize" ResourceKey="SemiFontSizeSmall" />
-    <x:Double x:Key="AppBarButtonOverflowMinHeight">36</x:Double>
-    <Thickness x:Key="AppBarButtonOverflowPadding">12 6</Thickness>
-    <!--  AppBarSeparator  -->
-    <x:Double x:Key="AppBarSeparatorWidth">1</x:Double>
-    <x:Double x:Key="AppBarSeparatorMinHeight">24</x:Double>
-    <Thickness x:Key="AppBarSeparatorMargin">8 4</Thickness>
-    <x:Double x:Key="AppBarSeparatorOverflowHeight">1</x:Double>
-    <Thickness x:Key="AppBarSeparatorOverflowMargin">4 4</Thickness>
+    <!--  CommandBarButton / CommandBarToggleButton  -->
+    <x:Double x:Key="CommandBarButtonWidth">64</x:Double>
+    <x:Double x:Key="CommandBarButtonCompactWidth">40</x:Double>
+    <x:Double x:Key="CommandBarButtonMinHeight">40</x:Double>
+    <Thickness x:Key="CommandBarButtonPadding">8 4</Thickness>
+    <x:Double x:Key="CommandBarButtonPanelSpacing">4</x:Double>
+    <StaticResource x:Key="CommandBarButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <StaticResource x:Key="CommandBarButtonLabelFontSize" ResourceKey="SemiFontSizeSmall" />
+    <x:Double x:Key="CommandBarButtonOverflowMinHeight">36</x:Double>
+    <Thickness x:Key="CommandBarButtonOverflowPadding">12 6</Thickness>
+    <!--  CommandBarSeparator  -->
+    <x:Double x:Key="CommandBarSeparatorWidth">1</x:Double>
+    <x:Double x:Key="CommandBarSeparatorMinHeight">24</x:Double>
+    <Thickness x:Key="CommandBarSeparatorMargin">8 4</Thickness>
+    <x:Double x:Key="CommandBarSeparatorOverflowHeight">1</x:Double>
+    <Thickness x:Key="CommandBarSeparatorOverflowMargin">4 4</Thickness>
    <!--  CommandBar  -->
    <x:Double x:Key="CommandBarMinHeight">48</x:Double>
    <Thickness x:Key="CommandBarPadding">4 0</Thickness>
--- a/src/Semi.Avalonia/Themes/Shared/Flyout.axaml
+++ b/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>
Author	SHA1	Message	Date
Zhang Dian	35b62fe3af	chore: bump version to 12.0.0-rc2.	2026-04-07 11:56:21 +08:00
Zhang Dian	c48d96e40f	Sync Avalonia 12.0.0-rc2 changes (#786 ) * chore: AppBar -> CommanrBar. * feat: Add keyboard navigation for overflow CommandBar popup. * chore: Style -> Theme in PipsPager. * chore: add Header/Footer templates to DrawerPage. * feaa: hide caption buttons when the platform does not support the action. * feat: Touch Improvements to TextBox. * chore: remove Opacity from PART_Placeholder. * feat: enable access key recognition for GroupBox. * feat: limit label text to a single line in CommandBar.	2026-04-01 23:01:45 +08:00
Zhang Dian	c128feb4ff	Refactor ProgressBar styles for improved layout and animation (#750 ) * refactor: refactor ProgressBar styles for improved layout and animation. * fix: set MinHeight for ProgressBar text part. * chore: remove useless Progress resources.	2026-04-01 18:05:01 +08:00
Zhang Dian	48c3837d81	chore: upgrade to Avalonia 12.0.0-rc2.	2026-04-01 11:28:01 +08:00