Implement PlaceholderText (#727)

* feat: replace Watermark with PlaceholderText in AutoCompleteBox and related controls

* fix: remove duplicate PlaceholderForeground setter.

Nuget.Config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <packageSources>
-        <add key="avalonia-nightly" value="https://nuget-feed-nightly.avaloniaui.net/v3/index.json" />
-    </packageSources>
-</configuration>

demo/Directory.Packages.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <AvaloniaVersion>12.0.0-preview2</AvaloniaVersion>
+        <AvaloniaVersion>12.0.999-cibuild0061987-alpha</AvaloniaVersion>
         <DataGridVersion>11.3.10</DataGridVersion>
         <SkiaSharpVersion>3.119.1</SkiaSharpVersion>
     </PropertyGroup>

demo/Semi.Avalonia.Demo/App.axaml.cs

@@ -22,7 +22,7 @@ public partial class App : Application
             case IClassicDesktopStyleApplicationLifetime desktop:
                 // Line below is needed to remove Avalonia data validation.
                 // Without this line you will get duplicate validations from both Avalonia and CT
-                // BindingPlugins.DataValidators.RemoveAt(0);
+                BindingPlugins.DataValidators.RemoveAt(0);
                 desktop.MainWindow = new MainWindow();
                 break;
             case ISingleViewApplicationLifetime singleView:

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

@@ -1,99 +0,0 @@
-<UserControl
-    x:Class="Semi.Avalonia.Demo.Pages.CommandBarDemo"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="600"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    <UserControl.Resources>
-        <StreamGeometry x:Key="SemiIconShare">
-            M17.5 2A3.5 3.5 0 1 1 15 7.95l-5.13 3.11a3.5 3.5 0 0 1 .03 1.78l5.22 3.1A3.49 3.49 0 0 1 21 18.5a3.5 3.5 0 1 1-6.9-.85l-5.22-3.08A3.49 3.49 0 0 1 3 12a3.5 3.5 0 0 1 5.8-2.63l5.27-3.19A3.5 3.5 0 0 1 17.5 2Z
-        </StreamGeometry>
-    </UserControl.Resources>
-    <ScrollViewer>
-        <StackPanel Spacing="16" Margin="0,0,0,16">
-
-            <!--  Default: label below icon (Bottom)  -->
-            <HeaderedContentControl Theme="{StaticResource GroupBox}">
-                <HeaderedContentControl.Header>
-                    <TextBlock Text="CommandBar — Label Position: Bottom (default)" />
-                </HeaderedContentControl.Header>
-                <CommandBar>
-                    <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}" />
-                    <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}" />
-                </CommandBar>
-            </HeaderedContentControl>
-
-            <!--  LabelPosition=Right  -->
-            <HeaderedContentControl Theme="{StaticResource GroupBox}">
-                <HeaderedContentControl.Header>
-                    <TextBlock Text="CommandBar — Label Position: Right" />
-                </HeaderedContentControl.Header>
-                <CommandBar DefaultLabelPosition="Right">
-                    <AppBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
-                    <AppBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
-                    <AppBarToggleButton Label="Underline" Icon="{DynamicResource SemiIconUnderline}" />
-                </CommandBar>
-            </HeaderedContentControl>
-
-            <!--  Compact (icons only)  -->
-            <HeaderedContentControl Theme="{StaticResource GroupBox}">
-                <HeaderedContentControl.Header>
-                    <TextBlock Text="CommandBar — Compact (icons only)" />
-                </HeaderedContentControl.Header>
-                <CommandBar DefaultLabelPosition="Collapsed">
-                    <AppBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
-                    <AppBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
-                    <AppBarToggleButton Label="Underline" Icon="{DynamicResource SemiIconUnderline}" />
-                </CommandBar>
-            </HeaderedContentControl>
-
-            <!--  With secondary commands (overflow)  -->
-            <HeaderedContentControl Theme="{StaticResource GroupBox}">
-                <HeaderedContentControl.Header>
-                    <TextBlock Text="CommandBar — With Secondary Commands (overflow)" />
-                </HeaderedContentControl.Header>
-                <CommandBar>
-                    <AppBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
-                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
-                    <AppBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
-                    <CommandBar.SecondaryCommands>
-                        <AppBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
-                        <AppBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
-                    </CommandBar.SecondaryCommands>
-                </CommandBar>
-            </HeaderedContentControl>
-
-            <HeaderedContentControl Theme="{StaticResource GroupBox}">
-                <HeaderedContentControl.Header>
-                    <StackPanel HorizontalAlignment="Left">
-                        <TextBlock Text="CommandBar — Dynamic Overflow" />
-                        <ToggleSwitch Name="idfe" IsChecked="True" />
-                        <Slider Name="ws" Width="500" Minimum="0" Maximum="500" Value="100" />
-                    </StackPanel>
-                </HeaderedContentControl.Header>
-                <CommandBar
-                    IsDynamicOverflowEnabled="{Binding #idfe.IsChecked}"
-                    Width="{Binding #ws.Value}">
-                    <AppBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
-                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
-                    <AppBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
-                    <AppBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
-                    <AppBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
-                </CommandBar>
-            </HeaderedContentControl>
-
-        </StackPanel>
-    </ScrollViewer>
-</UserControl>

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

@@ -1,11 +0,0 @@
-using Avalonia.Controls;
-
-namespace Semi.Avalonia.Demo.Pages;
-
-public partial class CommandBarDemo : UserControl
-{
-    public CommandBarDemo()
-    {
-        InitializeComponent();
-    }
-}

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

@@ -22,15 +22,6 @@
             TickFrequency="10"
             TickPlacement="Outside"
             Value="0" />
-        <Slider
-            Value="0"
-            Minimum="0"
-            Maximum="100"
-            TickPlacement="BottomRight"
-            IsSnapToTickEnabled="True"
-            IsDirectionReversed="True"
-            Ticks="0,20,25,40,75,100"
-            Width="300" />
         <Slider
             Width="300"
             Classes="ToolTip"

demo/Semi.Avalonia.Demo/Views/MainView.axaml

@@ -269,9 +269,6 @@
             <TabItem
                 Theme="{DynamicResource CategoryTabItem}"
                 Header="Other" />
-            <TabItem Header="CommandBar">
-                <pages:CommandBarDemo />
-            </TabItem>
             <TabItem Header="GridSplitter">
                 <pages:GridSplitterDemo />
             </TabItem>

demo/Semi.Avalonia.Demo/Views/MainWindow.axaml

@@ -5,12 +5,10 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:views="clr-namespace:Semi.Avalonia.Demo.Views"
-    Title="Semi Avalonia Demo"
+    Title="Semi.Avalonia.Demo"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    ExtendClientAreaToDecorationsHint="True"
-    ExtendClientAreaTitleBarHeightHint="40"
     Icon="/Assets/irihi.ico"
     mc:Ignorable="d">
-    <views:MainView Margin="{Binding $parent[Window].WindowDecorationMargin}" />
+    <views:MainView />
 </Window>

src/Directory.Packages.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <AvaloniaVersion>12.0.0-preview2</AvaloniaVersion>
+        <AvaloniaVersion>12.0.999-cibuild0061987-alpha</AvaloniaVersion>
         <DataGridVersion>11.3.7</DataGridVersion>
     </PropertyGroup>
     <ItemGroup>
@@ -9,6 +9,6 @@
         <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-preview1"/>
+        <PackageVersion Include="Irihi.Avalonia.Shared" Version="0.4.0-nightly-20260206184422"/>
     </ItemGroup>
 </Project>

src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
-        <Version>12.0.0-preview1</Version>
-        <PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 12.0.0-preview1</PackageReleaseNotes>
+        <TargetFramework>net8.0</TargetFramework>
+        <Version>11.3.7.2</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 11.3.7.2</PackageReleaseNotes>
         <Title>Semi.Avalonia.ColorPicker</Title>
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Irihi.Avalonia.Shared" />
         <PackageReference Include="Avalonia.Controls.ColorPicker"/>
-        <PackageReference Include="Irihi.Avalonia.Shared"/>
         <None Include="README.md" Pack="true" PackagePath="\"/>
     </ItemGroup>
 

src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs

@@ -1,7 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Utilities;
-using Irihi.Avalonia.Shared.Helpers;
 
 namespace Semi.Avalonia.ColorPicker;
 
@@ -221,8 +220,8 @@ public class SemiColorDarkPalette: IColorPalette
     public Color GetColor(int colorIndex, int shadeIndex)
     {
         return Colors[
-            MathHelpers.SafeClamp(colorIndex, 0, ColorCount - 1),
-            MathHelpers.SafeClamp(shadeIndex, 0, ShadeCount - 1)
+            MathUtilities.Clamp(colorIndex, 0, ColorCount - 1),
+            MathUtilities.Clamp(shadeIndex, 0, ShadeCount - 1)
         ];
     }
 

src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs

@@ -1,7 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Utilities;
-using Irihi.Avalonia.Shared.Helpers;
 
 namespace Semi.Avalonia.ColorPicker;
 
@@ -221,8 +220,8 @@ public class SemiColorLightPalette: IColorPalette
     public Color GetColor(int colorIndex, int shadeIndex)
     {
         return Colors[
-            MathHelpers.SafeClamp(colorIndex, 0, ColorCount - 1),
-            MathHelpers.SafeClamp(shadeIndex, 0, ShadeCount - 1)
+            MathUtilities.Clamp(colorIndex, 0, ColorCount - 1),
+            MathUtilities.Clamp(shadeIndex, 0, ShadeCount - 1)
         ];
     }
 

src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj

@@ -2,8 +2,8 @@
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
-        <Version>11.3.7.3</Version>
-        <PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 11.3.7.3</PackageReleaseNotes>
+        <Version>11.3.7.2</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 11.3.7.2</PackageReleaseNotes>
         <Title>Semi.Avalonia.DataGrid</Title>
     </PropertyGroup>
 

src/Semi.Avalonia/Controls/AutoCompleteBox.axaml

@@ -1,7 +1,6 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:iri="https://irihi.tech/shared">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.PreviewWith>
         <StackPanel Margin="20" Spacing="20">
             <TextBox Text="Hello" />
@@ -21,7 +20,6 @@
                             Name="PART_TextBox"
                             VerticalAlignment="Stretch"
                             MinHeight="{TemplateBinding MinHeight}"
-                            ClearSelectionOnLostFocus="{TemplateBinding ClearSelectionOnLostFocus}"
                             DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                             Theme="{DynamicResource NonErrorTextBox}"
                             InnerLeftContent="{TemplateBinding InnerLeftContent}"
@@ -58,13 +56,45 @@
         </Setter>
 
         <Style Selector="^.Bordered">
-            <Style Selector="^ /template/ TextBox#PART_TextBox">
-                <Setter Property="MinHeight" Value="0" />
-                <Setter Property="iri:ClassHelper.Classes" Value="Bordered" />
-            </Style>
-            <Style Selector="^ /template/ ListBox#PART_SelectingItemsControl">
-                <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="False" />
-            </Style>
+            <Setter Property="Template">
+                <ControlTemplate TargetType="AutoCompleteBox">
+                    <Panel>
+                        <TextBox
+                            Name="PART_TextBox"
+                            VerticalAlignment="Stretch"
+                            MinHeight="0"
+                            Classes="Bordered"
+                            DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                            PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
+                            PlaceholderText="{TemplateBinding PlaceholderText}" />
+                        <Popup
+                            Name="PART_Popup"
+                            MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                            InheritsTransform="True"
+                            IsLightDismissEnabled="True"
+                            PlacementTarget="{TemplateBinding}">
+                            <Border
+                                MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                                Margin="{DynamicResource AutoCompleteBoxPopupMargin}"
+                                Padding="{DynamicResource AutoCompleteBoxPopupPadding}"
+                                HorizontalAlignment="Stretch"
+                                Background="{DynamicResource AutoCompleteBoxPopupBackground}"
+                                BorderBrush="{DynamicResource AutoCompleteBoxPopupBorderBrush}"
+                                BorderThickness="{DynamicResource AutoCompleteBoxPopupBorderThickness}"
+                                BoxShadow="{DynamicResource AutoCompleteBoxPopupBoxShadow}"
+                                CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}">
+                                <ListBox
+                                    Name="PART_SelectingItemsControl"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    ItemTemplate="{TemplateBinding ItemTemplate}"
+                                    ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                    ScrollViewer.VerticalScrollBarVisibility="Auto" 
+                                    ScrollViewer.IsScrollChainingEnabled="False" />
+                            </Border>
+                        </Popup>
+                    </Panel>
+                </ControlTemplate>
+            </Setter>
         </Style>
         <Style Selector="^.Large">
             <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxLargeHeight}" />

src/Semi.Avalonia/Controls/CaptionButtons.axaml

@@ -0,0 +1,100 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+        <CaptionButtons />
+    </Design.PreviewWith>
+
+    <ControlTheme x:Key="CaptionButton" TargetType="Button">
+        <Setter Property="Foreground" Value="{DynamicResource CaptionButtonForeground}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="CornerRadius" Value="{StaticResource CaptionButtonCornerRadius}" />
+        <Setter Property="Padding" Value="{StaticResource CaptionButtonPadding}" />
+        <Setter Property="Width" Value="{StaticResource CaptionButtonWidth}" />
+        <Setter Property="Height" Value="{StaticResource CaptionButtonHeight}" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="Button">
+                <ContentPresenter
+                    Name="PART_ContentPresenter"
+                    Padding="{TemplateBinding Padding}"
+                    Foreground="{TemplateBinding Foreground}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Content="{TemplateBinding Content}"
+                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                    CornerRadius="{TemplateBinding CornerRadius}" />
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:pointerover">
+            <Setter Property="Background" Value="{DynamicResource CaptionButtonPointeroverBackground}" />
+        </Style>
+
+        <Style Selector="^:pressed">
+            <Setter Property="Background" Value="{DynamicResource CaptionButtonPressedBackground}" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type CaptionButtons}" TargetType="CaptionButtons">
+        <Setter Property="Foreground" Value="{DynamicResource CaptionButtonForeground}" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="CaptionButtons">
+                <StackPanel Orientation="Horizontal">
+                    <Button Name="PART_FullScreenButton" Theme="{StaticResource CaptionButton}">
+                        <PathIcon
+                            Name="PART_FullScreenButtonIcon"
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource WindowExpandGlyph}"
+                            Foreground="{Binding $parent[Button].Foreground}" />
+                    </Button>
+                    <Button Name="PART_MinimizeButton" Theme="{StaticResource CaptionButton}">
+                        <PathIcon
+                            Name="PART_MinimizeButtonIcon"
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource WindowMinimizeGlyph}"
+                            Foreground="{Binding $parent[Button].Foreground}" />
+                    </Button>
+                    <Button Name="PART_RestoreButton" Theme="{StaticResource CaptionButton}">
+                        <PathIcon
+                            Name="PART_RestoreButtonIcon"
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource WindowMaximizeGlyph}"
+                            Foreground="{Binding $parent[Button].Foreground}" />
+                    </Button>
+                    <Button Name="PART_CloseButton" Theme="{StaticResource CaptionButton}">
+                        <PathIcon
+                            Name="PART_CloseButtonIcon"
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource WindowCloseIconGlyph}"
+                            Foreground="{Binding $parent[Button].Foreground}" />
+                    </Button>
+                </StackPanel>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^ /template/ Button#PART_CloseButton:pointerover">
+            <Setter Property="Foreground" Value="{DynamicResource CaptionButtonCloseForeground}" />
+            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePointeroverBackground}" />
+        </Style>
+        <Style Selector="^ /template/ Button#PART_CloseButton:pressed">
+            <Setter Property="Foreground" Value="{DynamicResource CaptionButtonCloseForeground}" />
+            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePressedBackground}" />
+        </Style>
+
+        <Style Selector="^:maximized /template/ PathIcon#PART_RestoreButtonIcon">
+            <Setter Property="Data" Value="{StaticResource WindowRestoreGlyph}" />
+        </Style>
+        <Style Selector="^:fullscreen /template/ PathIcon#PART_FullScreenButtonIcon">
+            <Setter Property="Data" Value="{StaticResource WindowCollapseGlyph}" />
+        </Style>
+        <Style Selector="^:fullscreen /template/ Button#PART_RestoreButton">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^:fullscreen /template/ Button#PART_MinimizeButton">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/CommandBar.axaml

@@ -1,406 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <Design.PreviewWith>
-        <Border Padding="16" Width="600" Background="{DynamicResource SemiColorBackground0}">
-            <StackPanel Spacing="16">
-                <CommandBar>
-                    <AppBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
-                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
-                    <AppBarSeparator />
-                    <AppBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
-                    <AppBarButton Label="Copy" IsEnabled="False" Icon="{DynamicResource SemiIconCopy}" />
-                </CommandBar>
-            </StackPanel>
-        </Border>
-    </Design.PreviewWith>
-
-    <!--  AppBarButton  -->
-    <ControlTheme x:Key="{x:Type AppBarButton}" TargetType="AppBarButton">
-        <Setter Property="Background" Value="{DynamicResource AppBarButtonBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource AppBarButtonForeground}" />
-        <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="CornerRadius" Value="{DynamicResource AppBarButtonCornerRadius}" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="AppBarButton">
-                <Border
-                    Name="PART_Border"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    Padding="{TemplateBinding Padding}">
-                    <StackPanel
-                        Name="PART_LayoutRoot"
-                        Spacing="4"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                        <ContentPresenter
-                            Name="PART_IconPresenter"
-                            Content="{TemplateBinding Icon}"
-                            Foreground="{TemplateBinding Foreground}"
-                            Width="{DynamicResource AppBarButtonIconSize}"
-                            Height="{DynamicResource AppBarButtonIconSize}"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center">
-                            <ContentPresenter.DataTemplates>
-                                <DataTemplate DataType="Geometry">
-                                    <PathIcon
-                                        Theme="{DynamicResource InnerPathIcon}"
-                                        Data="{Binding}" />
-                                </DataTemplate>
-                            </ContentPresenter.DataTemplates>
-                        </ContentPresenter>
-                        <TextBlock
-                            Name="PART_Label"
-                            Text="{TemplateBinding Label}"
-                            Foreground="{TemplateBinding Foreground}"
-                            FontSize="{DynamicResource AppBarButtonLabelFontSize}"
-                            HorizontalAlignment="Center"
-                            TextTrimming="CharacterEllipsis" />
-                    </StackPanel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-
-        <!--  Pointer over  -->
-        <Style Selector="^:pointerover /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource AppBarButtonPointeroverBackground}" />
-        </Style>
-
-        <!--  Pressed  -->
-        <Style Selector="^:pressed /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource AppBarButtonPressedBackground}" />
-        </Style>
-
-        <!--  Disabled  -->
-        <Style Selector="^:disabled /template/ ContentPresenter#PART_IconPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource AppBarButtonDisabledForeground}" />
-        </Style>
-        <Style Selector="^:disabled /template/ TextBlock#PART_Label">
-            <Setter Property="Foreground" Value="{DynamicResource AppBarButtonDisabledForeground}" />
-        </Style>
-
-        <!--  IsCompact: hide label, use compact width  -->
-        <Style Selector="^[IsCompact=True]">
-            <Setter Property="Width" Value="{DynamicResource AppBarButtonCompactWidth}" />
-        </Style>
-        <Style Selector="^[IsCompact=True] /template/ TextBlock#PART_Label">
-            <Setter Property="IsVisible" Value="False" />
-        </Style>
-
-        <!--  LabelPosition=Collapsed: hide label, use compact width  -->
-        <Style Selector="^[LabelPosition=Collapsed]">
-            <Setter Property="Width" Value="{DynamicResource AppBarButtonCompactWidth}" />
-        </Style>
-        <Style Selector="^[LabelPosition=Collapsed] /template/ TextBlock#PART_Label">
-            <Setter Property="IsVisible" Value="False" />
-        </Style>
-
-        <!--  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}" />
-        </Style>
-        <Style Selector="^[LabelPosition=Right] /template/ StackPanel#PART_LayoutRoot">
-            <Setter Property="Orientation" Value="Horizontal" />
-        </Style>
-        <Style Selector="^[LabelPosition=Right] /template/ ContentPresenter#PART_IconPresenter">
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-        <Style Selector="^[LabelPosition=Right] /template/ TextBlock#PART_Label">
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-
-        <!--  IsInOverflow: full-width horizontal layout for use inside overflow popup  -->
-        <Style Selector="^[IsInOverflow=True]">
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <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}" />
-        </Style>
-        <Style Selector="^[IsInOverflow=True] /template/ StackPanel#PART_LayoutRoot">
-            <Setter Property="Orientation" Value="Horizontal" />
-        </Style>
-        <Style Selector="^[IsInOverflow=True] /template/ ContentPresenter#PART_IconPresenter">
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-        <Style Selector="^[IsInOverflow=True] /template/ TextBlock#PART_Label">
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-    </ControlTheme>
-
-    <!--  AppBarToggleButton  -->
-    <ControlTheme x:Key="{x:Type AppBarToggleButton}" TargetType="AppBarToggleButton">
-        <Setter Property="Background" Value="{DynamicResource AppBarButtonBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource AppBarButtonForeground}" />
-        <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="CornerRadius" Value="{DynamicResource AppBarButtonCornerRadius}" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="AppBarToggleButton">
-                <Border
-                    Name="PART_Border"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    Padding="{TemplateBinding Padding}">
-                    <StackPanel
-                        Name="PART_LayoutRoot"
-                        Spacing="4"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                        <ContentPresenter
-                            Name="PART_IconPresenter"
-                            Content="{TemplateBinding Icon}"
-                            Foreground="{TemplateBinding Foreground}"
-                            Width="{DynamicResource AppBarButtonIconSize}"
-                            Height="{DynamicResource AppBarButtonIconSize}"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center">
-                            <ContentPresenter.DataTemplates>
-                                <DataTemplate DataType="Geometry">
-                                    <PathIcon
-                                        Theme="{DynamicResource InnerPathIcon}"
-                                        Data="{Binding}" />
-                                </DataTemplate>
-                            </ContentPresenter.DataTemplates>
-                        </ContentPresenter>
-                        <TextBlock
-                            Name="PART_Label"
-                            Text="{TemplateBinding Label}"
-                            Foreground="{TemplateBinding Foreground}"
-                            FontSize="{DynamicResource AppBarButtonLabelFontSize}"
-                            HorizontalAlignment="Center"
-                            TextTrimming="CharacterEllipsis" />
-                    </StackPanel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-
-        <!--  Pointer over  -->
-        <Style Selector="^:pointerover /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource AppBarButtonPointeroverBackground}" />
-        </Style>
-
-        <!--  Pressed  -->
-        <Style Selector="^:pressed /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource AppBarButtonPressedBackground}" />
-        </Style>
-
-        <!--  Checked  -->
-        <Style Selector="^:checked /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource AppBarToggleButtonCheckedBackground}" />
-        </Style>
-        <Style Selector="^:checked /template/ ContentPresenter#PART_IconPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource AppBarToggleButtonCheckedForeground}" />
-        </Style>
-        <Style Selector="^:checked /template/ TextBlock#PART_Label">
-            <Setter Property="Foreground" Value="{DynamicResource AppBarToggleButtonCheckedForeground}" />
-        </Style>
-
-        <!--  Checked + Pointer over  -->
-        <Style Selector="^:checked:pointerover /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource AppBarToggleButtonCheckedPointeroverBackground}" />
-        </Style>
-
-        <!--  Disabled  -->
-        <Style Selector="^:disabled /template/ ContentPresenter#PART_IconPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource AppBarButtonDisabledForeground}" />
-        </Style>
-        <Style Selector="^:disabled /template/ TextBlock#PART_Label">
-            <Setter Property="Foreground" Value="{DynamicResource AppBarButtonDisabledForeground}" />
-        </Style>
-
-        <!--  IsCompact: hide label, use compact width  -->
-        <Style Selector="^[IsCompact=True]">
-            <Setter Property="Width" Value="{DynamicResource AppBarButtonCompactWidth}" />
-        </Style>
-        <Style Selector="^[IsCompact=True] /template/ TextBlock#PART_Label">
-            <Setter Property="IsVisible" Value="False" />
-        </Style>
-
-        <!--  LabelPosition=Collapsed: hide label, use compact width  -->
-        <Style Selector="^[LabelPosition=Collapsed]">
-            <Setter Property="Width" Value="{DynamicResource AppBarButtonCompactWidth}" />
-        </Style>
-        <Style Selector="^[LabelPosition=Collapsed] /template/ TextBlock#PART_Label">
-            <Setter Property="IsVisible" Value="False" />
-        </Style>
-
-        <!--  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}" />
-        </Style>
-        <Style Selector="^[LabelPosition=Right] /template/ StackPanel#PART_LayoutRoot">
-            <Setter Property="Orientation" Value="Horizontal" />
-        </Style>
-        <Style Selector="^[LabelPosition=Right] /template/ ContentPresenter#PART_IconPresenter">
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-        <Style Selector="^[LabelPosition=Right] /template/ TextBlock#PART_Label">
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-
-        <!--  IsInOverflow: full-width horizontal layout  -->
-        <Style Selector="^[IsInOverflow=True]">
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <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}" />
-        </Style>
-        <Style Selector="^[IsInOverflow=True] /template/ StackPanel#PART_LayoutRoot">
-            <Setter Property="Orientation" Value="Horizontal" />
-        </Style>
-        <Style Selector="^[IsInOverflow=True] /template/ ContentPresenter#PART_IconPresenter">
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-        <Style Selector="^[IsInOverflow=True] /template/ TextBlock#PART_Label">
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </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}" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="AppBarSeparator">
-                <Border
-                    Background="{TemplateBinding Background}"
-                    Width="{TemplateBinding Width}"
-                    MinHeight="{TemplateBinding MinHeight}" />
-            </ControlTemplate>
-        </Setter>
-
-        <!--  IsInOverflow: horizontal line separator  -->
-        <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="MinHeight" Value="0" />
-            <Setter Property="Margin" Value="{DynamicResource AppBarSeparatorOverflowMargin}" />
-        </Style>
-    </ControlTheme>
-
-    <!--  CommandBar  -->
-    <ControlTheme x:Key="{x:Type CommandBar}" TargetType="CommandBar">
-        <Setter Property="Background" Value="{DynamicResource CommandBarBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource CommandBarForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CommandBarBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource CommandBarBorderThickness}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource CommandBarCornerRadius}" />
-        <Setter Property="MinHeight" Value="{DynamicResource CommandBarMinHeight}" />
-        <Setter Property="Padding" Value="{DynamicResource CommandBarPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="CommandBar">
-                <Border
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    MinHeight="{TemplateBinding MinHeight}"
-                    Padding="{TemplateBinding Padding}">
-                    <Panel>
-                        <DockPanel>
-                            <!--  Overflow button (docked right)  -->
-                            <Button
-                                Name="PART_OverflowButton"
-                                DockPanel.Dock="Right"
-                                Theme="{DynamicResource AppBarOverflowButton}"
-                                IsVisible="{TemplateBinding IsOverflowButtonVisible}"
-                                VerticalAlignment="Stretch">
-                                <PathIcon
-                                    Width="{DynamicResource AppBarButtonIconSize}"
-                                    Height="{DynamicResource AppBarButtonIconSize}"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    Data="{DynamicResource CommandBarOverflowButtonGlyph}" />
-                            </Button>
-
-                            <!--  Custom content (docked left)  -->
-                            <ContentPresenter
-                                Name="PART_ContentPresenter"
-                                DockPanel.Dock="Left"
-                                Content="{TemplateBinding Content}"
-                                VerticalAlignment="Center" />
-
-                            <!--  Primary commands (fills remaining space, right-aligned)  -->
-                            <ItemsControl
-                                Name="PART_PrimaryCommands"
-                                ItemsSource="{Binding VisiblePrimaryCommands, RelativeSource={RelativeSource TemplatedParent}}"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Stretch"
-                                ClipToBounds="True">
-                                <ItemsControl.ItemsPanel>
-                                    <ItemsPanelTemplate>
-                                        <StackPanel Orientation="Horizontal" Spacing="2" />
-                                    </ItemsPanelTemplate>
-                                </ItemsControl.ItemsPanel>
-                            </ItemsControl>
-                        </DockPanel>
-
-                        <!--  Overflow popup  -->
-                        <Popup
-                            Name="PART_OverflowPopup"
-                            IsOpen="{TemplateBinding IsOpen, Mode=TwoWay}"
-                            PlacementTarget="{Binding #PART_OverflowButton}"
-                            Placement="Bottom"
-                            IsLightDismissEnabled="True"
-                            WindowManagerAddShadowHint="False">
-                            <Border
-                                Background="{DynamicResource CommandBarOverflowBackground}"
-                                BorderBrush="{DynamicResource CommandBarOverflowBorderBrush}"
-                                BorderThickness="{DynamicResource CommandBarBorderThickness}"
-                                BoxShadow="{DynamicResource CommandBarOverflowBoxShadow}"
-                                CornerRadius="{DynamicResource CommandBarOverflowCornerRadius}"
-                                Padding="{DynamicResource CommandBarOverflowPadding}"
-                                MinWidth="{DynamicResource CommandBarOverflowMinWidth}">
-                                <ItemsControl
-                                    ItemsSource="{Binding OverflowItems, RelativeSource={RelativeSource TemplatedParent}}">
-                                    <ItemsControl.ItemsPanel>
-                                        <ItemsPanelTemplate>
-                                            <StackPanel Spacing="2" />
-                                        </ItemsPanelTemplate>
-                                    </ItemsControl.ItemsPanel>
-                                </ItemsControl>
-                            </Border>
-                        </Popup>
-                    </Panel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </ControlTheme>
-
-    <!--  Overflow button inner theme (borderless, transparent)  -->
-    <ControlTheme x:Key="AppBarOverflowButton" TargetType="Button"
-                  BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Padding" Value="{DynamicResource AppBarButtonPadding}" />
-        <Setter Property="MinWidth" Value="{DynamicResource AppBarButtonCompactWidth}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource AppBarButtonCornerRadius}" />
-    </ControlTheme>
-
-</ResourceDictionary>

src/Semi.Avalonia/Controls/DatePicker.axaml

@@ -2,10 +2,9 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.PreviewWith>
-        <StackPanel Margin="20">
+        <Border Padding="20">
             <DatePickerPresenter />
-            <DatePicker Width="500" />
-        </StackPanel>
+        </Border>
     </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type DatePickerPresenter}" TargetType="DatePickerPresenter">
         <Setter Property="Width" Value="296" />
@@ -142,7 +141,6 @@
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
-        <Setter Property="MinWidth" Value="296" />
         <Setter Property="Template">
             <ControlTemplate TargetType="DatePicker">
                 <DataValidationErrors>
@@ -154,8 +152,8 @@
                             Name="PART_FlyoutButton"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
-                            MinWidth="{TemplateBinding MinWidth}"
-                            MaxWidth="{TemplateBinding MaxWidth}"
+                            Width="298"
+                            MinWidth="298"
                             MinHeight="{TemplateBinding MinHeight}"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"

src/Semi.Avalonia/Controls/ScrollViewer.axaml

@@ -53,7 +53,6 @@
                                 MinWidth="{StaticResource ScrollBarThickness}"
                                 VerticalAlignment="Center"
                                 Focusable="False"
-                                AutomationProperties.Name="Column left"
                                 Theme="{StaticResource ScrollBarRepeatButton}">
                                 <PathIcon
                                     Theme="{StaticResource InnerPathIcon}"
@@ -76,7 +75,6 @@
                                         VerticalAlignment="Stretch"
                                         CornerRadius="0"
                                         Focusable="False"
-                                        AutomationProperties.Name="Page left"
                                         Theme="{StaticResource ScrollBarRepeatButton}" />
                                 </Track.DecreaseButton>
                                 <Track.IncreaseButton>
@@ -87,10 +85,9 @@
                                         VerticalAlignment="Stretch"
                                         CornerRadius="0"
                                         Focusable="False"
-                                        AutomationProperties.Name="Page right"
                                         Theme="{StaticResource ScrollBarRepeatButton}" />
                                 </Track.IncreaseButton>
-                                <Thumb Name="thumb" AutomationProperties.Name="Position" />
+                                <Thumb Name="thumb" />
                             </Track>
                             <RepeatButton
                                 Name="PART_LineDownButton"
@@ -99,7 +96,6 @@
                                 VerticalAlignment="Center"
                                 VerticalContentAlignment="Center"
                                 Focusable="False"
-                                AutomationProperties.Name="Column right"
                                 Theme="{DynamicResource ScrollBarRepeatButton}">
                                 <PathIcon
                                     Theme="{DynamicResource InnerPathIcon}"
@@ -127,7 +123,6 @@
                                 HorizontalContentAlignment="Center"
                                 VerticalContentAlignment="Center"
                                 Focusable="False"
-                                AutomationProperties.Name="Line up"
                                 Theme="{StaticResource ScrollBarRepeatButton}">
                                 <PathIcon
                                     Theme="{StaticResource InnerPathIcon}"
@@ -151,7 +146,6 @@
                                         VerticalAlignment="Stretch"
                                         CornerRadius="0"
                                         Focusable="False"
-                                        AutomationProperties.Name="Page up"
                                         Theme="{StaticResource ScrollBarRepeatButton}" />
                                 </Track.DecreaseButton>
                                 <Track.IncreaseButton>
@@ -162,10 +156,9 @@
                                         VerticalAlignment="Stretch"
                                         CornerRadius="0"
                                         Focusable="False"
-                                        AutomationProperties.Name="Page down"
                                         Theme="{StaticResource ScrollBarRepeatButton}" />
                                 </Track.IncreaseButton>
-                                <Thumb Name="thumb" AutomationProperties.Name="Position" />
+                                <Thumb Name="thumb" />
                             </Track>
                             <RepeatButton
                                 Name="PART_LineDownButton"
@@ -174,7 +167,6 @@
                                 HorizontalContentAlignment="Center"
                                 VerticalContentAlignment="Center"
                                 Focusable="False"
-                                AutomationProperties.Name="Line down"
                                 Theme="{StaticResource ScrollBarRepeatButton}">
                                 <PathIcon
                                     Theme="{StaticResource InnerPathIcon}"

src/Semi.Avalonia/Controls/SelectableTextBlock.axaml

@@ -2,10 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <MenuFlyout
-        x:Key="SelectableTextBlockContextFlyout"
-        ShowMode="{OnFormFactor Desktop=Standard, Mobile=Transient}"
-        Placement="Bottom">
+    <MenuFlyout x:Key="SelectableTextBlockContextFlyout" Placement="Bottom">
         <MenuItem
             Command="{Binding $parent[SelectableTextBlock].Copy}"
             Header="{DynamicResource STRING_MENU_COPY}"

src/Semi.Avalonia/Controls/Slider.axaml

@@ -92,12 +92,11 @@
                                 VerticalAlignment="Bottom"
                                 Fill="{DynamicResource SliderTickForeground}"
                                 IsVisible="False"
-                                Maximum="{TemplateBinding Maximum}"
-                                Minimum="{TemplateBinding Minimum}"
-                                Orientation="{TemplateBinding Orientation}"
+                                Maximum="{TemplateBinding Slider.Maximum}"
+                                Minimum="{TemplateBinding Slider.Minimum}"
+                                Orientation="{TemplateBinding Slider.Orientation}"
                                 Placement="Top"
-                                IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
-                                TickFrequency="{TemplateBinding TickFrequency}"
+                                TickFrequency="{TemplateBinding Slider.TickFrequency}"
                                 Ticks="{TemplateBinding Ticks}" />
                             <TickBar
                                 Name="BottomTickBar"
@@ -107,12 +106,11 @@
                                 VerticalAlignment="Top"
                                 Fill="{DynamicResource SliderTickForeground}"
                                 IsVisible="False"
-                                Maximum="{TemplateBinding Maximum}"
-                                Minimum="{TemplateBinding Minimum}"
-                                Orientation="{TemplateBinding Orientation}"
+                                Maximum="{TemplateBinding Slider.Maximum}"
+                                Minimum="{TemplateBinding Slider.Minimum}"
+                                Orientation="{TemplateBinding Slider.Orientation}"
                                 Placement="Bottom"
-                                IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
-                                TickFrequency="{TemplateBinding TickFrequency}"
+                                TickFrequency="{TemplateBinding Slider.TickFrequency}"
                                 Ticks="{TemplateBinding Ticks}" />
                             <Track
                                 Name="PART_Track"
@@ -171,12 +169,11 @@
                                 HorizontalAlignment="Right"
                                 Fill="{DynamicResource SliderTickForeground}"
                                 IsVisible="False"
-                                Maximum="{TemplateBinding Maximum}"
-                                Minimum="{TemplateBinding Minimum}"
-                                Orientation="{TemplateBinding Orientation}"
+                                Maximum="{TemplateBinding Slider.Maximum}"
+                                Minimum="{TemplateBinding Slider.Minimum}"
+                                Orientation="{TemplateBinding Slider.Orientation}"
                                 Placement="Left"
-                                IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
-                                TickFrequency="{TemplateBinding TickFrequency}"
+                                TickFrequency="{TemplateBinding Slider.TickFrequency}"
                                 Ticks="{TemplateBinding Ticks}" />
                             <TickBar
                                 Name="RightTickBar"
@@ -186,12 +183,11 @@
                                 HorizontalAlignment="Left"
                                 Fill="{DynamicResource SliderTickForeground}"
                                 IsVisible="False"
-                                Maximum="{TemplateBinding Maximum}"
-                                Minimum="{TemplateBinding Minimum}"
-                                Orientation="{TemplateBinding Orientation}"
+                                Maximum="{TemplateBinding Slider.Maximum}"
+                                Minimum="{TemplateBinding Slider.Minimum}"
+                                Orientation="{TemplateBinding Slider.Orientation}"
                                 Placement="Right"
-                                IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
-                                TickFrequency="{TemplateBinding TickFrequency}"
+                                TickFrequency="{TemplateBinding Slider.TickFrequency}"
                                 Ticks="{TemplateBinding Ticks}" />
                             <Track
                                 Name="PART_Track"

src/Semi.Avalonia/Controls/TextBox.axaml

@@ -1,10 +1,7 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <MenuFlyout
-        x:Key="DefaultTextBoxContextFlyout"
-        ShowMode="{OnFormFactor Desktop=Standard, Mobile=Transient}"
-        Placement="Bottom">
+    <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
         <MenuItem
             Command="{Binding $parent[TextBox].Cut}"
             Header="{DynamicResource STRING_MENU_CUT}"

src/Semi.Avalonia/Controls/TimePicker.axaml

@@ -2,10 +2,9 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.PreviewWith>
-        <StackPanel Margin="20">
+        <Border Padding="20">
             <TimePickerPresenter />
-            <TimePicker UseSeconds="True" Width="500" />
-        </StackPanel>
+        </Border>
     </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type TimePickerPresenter}" TargetType="TimePickerPresenter">
         <Setter Property="Width" Value="242" />
@@ -164,7 +163,6 @@
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
-        <Setter Property="MinWidth" Value="242" />
         <Setter Property="Template">
             <ControlTemplate>
                 <DataValidationErrors>
@@ -176,8 +174,8 @@
                             Name="PART_FlyoutButton"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
-                            MinWidth="{TemplateBinding MinWidth}"
-                            MaxWidth="{TemplateBinding MaxWidth}"
+                            Width="242"
+                            MinWidth="242"
                             MinHeight="{TemplateBinding MinHeight}"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"

src/Semi.Avalonia/Controls/TitleBar.axaml

@@ -0,0 +1,51 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type TitleBar}" TargetType="TitleBar">
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="Stretch">
+                    <Panel
+                        Name="PART_MouseTracker"
+                        Height="1"
+                        VerticalAlignment="Top" />
+                    <Panel Name="PART_Container">
+                        <Border
+                            Name="PART_Background"
+                            Background="{TemplateBinding Background}"
+                            IsHitTestVisible="False" />
+                        <CaptionButtons
+                            Name="PART_CaptionButtons"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            Foreground="{TemplateBinding Foreground}" />
+                    </Panel>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:fullscreen /template/ Border#PART_Background">
+            <Setter Property="IsHitTestVisible" Value="True" />
+        </Style>
+
+        <Style Selector="^:fullscreen /template/ Panel#PART_MouseTracker">
+            <Setter Property="Background" Value="Transparent" />
+        </Style>
+
+        <Style Selector="^:fullscreen /template/ Panel#PART_Container">
+            <Setter Property="RenderTransform" Value="translateY(-50px)" />
+            <Setter Property="Transitions">
+                <Transitions>
+                    <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.1" />
+                </Transitions>
+            </Setter>
+        </Style>
+
+        <Style Selector="^:fullscreen:pointerover /template/ Panel#PART_Container">
+            <Setter Property="RenderTransform" Value="none" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/Window.axaml

@@ -15,6 +15,9 @@
                     <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
                     <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
                     <VisualLayerManager>
+                        <VisualLayerManager.ChromeOverlayLayer>
+                            <TitleBar />
+                        </VisualLayerManager.ChromeOverlayLayer>
                         <ContentPresenter
                             Name="PART_ContentPresenter"
                             Margin="{TemplateBinding Padding}"

src/Semi.Avalonia/Controls/WindowDrawnDecorations.axaml

@@ -1,206 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <ControlTheme x:Key="CaptionButton" TargetType="Button">
-        <Setter Property="Foreground" Value="{DynamicResource CaptionButtonForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="CornerRadius" Value="{StaticResource CaptionButtonCornerRadius}" />
-        <Setter Property="Padding" Value="{StaticResource CaptionButtonPadding}" />
-        <Setter Property="Width" Value="{StaticResource CaptionButtonWidth}" />
-        <Setter Property="Height" Value="{StaticResource CaptionButtonHeight}" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="VerticalAlignment" Value="Stretch" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="Button">
-                <ContentPresenter
-                    Name="PART_ContentPresenter"
-                    Padding="{TemplateBinding Padding}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    Foreground="{TemplateBinding Foreground}" />
-            </ControlTemplate>
-        </Setter>
-
-        <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource CaptionButtonPointeroverBackground}" />
-        </Style>
-
-        <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource CaptionButtonPressedBackground}" />
-        </Style>
-    </ControlTheme>
-
-    <ControlTheme x:Key="{x:Type WindowDrawnDecorations}" TargetType="WindowDrawnDecorations">
-        <Setter Property="DefaultTitleBarHeight" Value="32" />
-        <Setter Property="DefaultFrameThickness" Value="1" />
-        <Setter Property="DefaultShadowThickness" Value="16" />
-        <Setter Property="Template">
-            <WindowDrawnDecorationsTemplate>
-                <WindowDrawnDecorationsContent>
-                    <WindowDrawnDecorationsContent.Underlay>
-                        <!--  Full-size: covers shadow area + frame + behind client area  -->
-                        <Panel>
-                            <Border
-                                x:Name="PART_WindowBorder"
-                                Margin="{TemplateBinding ShadowThickness}"
-                                Background="{DynamicResource WindowBackground}"
-                                BorderBrush="{DynamicResource WindowBorderBrush}"
-                                BorderThickness="1"
-                                BoxShadow="0 8 32 0 #40000000" />
-                            <!-- Titlebar: background, title text, and drag area live in underlay -->
-                            <Panel x:Name="PART_TitleBar" VerticalAlignment="Top"
-                                   Height="{TemplateBinding TitleBarHeight}"
-                                   Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
-                                   IsVisible="{TemplateBinding HasTitleBar}"
-                                   WindowDecorationProperties.ElementRole="TitleBar" />
-                        </Panel>
-                    </WindowDrawnDecorationsContent.Underlay>
-
-                    <WindowDrawnDecorationsContent.Overlay>
-                        <!--  Positioned over the titlebar area  -->
-                        <Panel x:Name="PART_OverlayWrapper">
-                            <!--  Title text lives in overlay so it renders above client content  -->
-                            <Panel
-                                x:Name="PART_TitleTextPanel"
-                                Height="{TemplateBinding TitleBarHeight}"
-                                VerticalAlignment="Top"
-                                IsHitTestVisible="False"
-                                IsVisible="{TemplateBinding HasTitleBar}">
-                                <TextBlock
-                                    Margin="12,0,0,0"
-                                    VerticalAlignment="Center"
-                                    FontSize="12"
-                                    Text="{TemplateBinding Title}" />
-                            </Panel>
-                            <StackPanel
-                                x:Name="PART_OverlayPanel"
-                                Height="{TemplateBinding TitleBarHeight}"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Top"
-                                IsVisible="{TemplateBinding HasTitleBar}"
-                                Orientation="Horizontal"
-                                Spacing="2"
-                                TextElement.FontSize="10">
-                                <Button
-                                    Name="PART_FullScreenButton"
-                                    Theme="{StaticResource CaptionButton}"
-                                    WindowDecorationProperties.ElementRole="FullScreenButton">
-                                    <PathIcon
-                                        Name="PART_FullScreenButtonIcon"
-                                        Data="{StaticResource WindowExpandGlyph}"
-                                        Foreground="{Binding $parent[Button].Foreground}"
-                                        Theme="{StaticResource InnerPathIcon}" />
-                                </Button>
-                                <Button
-                                    Name="PART_MinimizeButton"
-                                    AutomationProperties.Name="Minimize"
-                                    Theme="{StaticResource CaptionButton}"
-                                    WindowDecorationProperties.ElementRole="MinimizeButton">
-                                    <PathIcon
-                                        Name="PART_MinimizeButtonIcon"
-                                        Data="{StaticResource WindowMinimizeGlyph}"
-                                        Foreground="{Binding $parent[Button].Foreground}"
-                                        Theme="{StaticResource InnerPathIcon}" />
-                                </Button>
-                                <Button
-                                    Name="PART_MaximizeButton"
-                                    AutomationProperties.Name="Maximize"
-                                    Theme="{StaticResource CaptionButton}"
-                                    WindowDecorationProperties.ElementRole="MaximizeButton">
-                                    <PathIcon
-                                        Name="PART_MaximizeButtonIcon"
-                                        Data="{StaticResource WindowMaximizeGlyph}"
-                                        Foreground="{Binding $parent[Button].Foreground}"
-                                        Theme="{StaticResource InnerPathIcon}" />
-                                </Button>
-                                <Button
-                                    Name="PART_CloseButton"
-                                    AutomationProperties.Name="Close"
-                                    Theme="{StaticResource CaptionButton}"
-                                    WindowDecorationProperties.ElementRole="CloseButton">
-                                    <PathIcon
-                                        Name="PART_CloseButtonIcon"
-                                        Data="{StaticResource WindowCloseIconGlyph}"
-                                        Foreground="{Binding $parent[Button].Foreground}"
-                                        Theme="{StaticResource InnerPathIcon}" />
-                                </Button>
-                            </StackPanel>
-                        </Panel>
-                    </WindowDrawnDecorationsContent.Overlay>
-
-                    <WindowDrawnDecorationsContent.FullscreenPopover>
-                        <!--  Shown on hover at top edge in fullscreen  -->
-                        <DockPanel Height="{TemplateBinding TitleBarHeight}" Background="#E0000000">
-                            <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
-                                <Button
-                                    x:Name="PART_PopoverFullScreenButton"
-                                    Theme="{StaticResource CaptionButton}"
-                                    WindowDecorationProperties.ElementRole="FullScreenButton">
-                                    <PathIcon
-                                        Data="{StaticResource WindowCollapseGlyph}"
-                                        Foreground="{Binding $parent[Button].Foreground}"
-                                        Theme="{StaticResource InnerPathIcon}" />
-                                </Button>
-                            </StackPanel>
-                            <TextBlock
-                                Margin="12,0"
-                                VerticalAlignment="Center"
-                                Foreground="White"
-                                Text="{TemplateBinding Title}" />
-                        </DockPanel>
-                    </WindowDrawnDecorationsContent.FullscreenPopover>
-                </WindowDrawnDecorationsContent>
-            </WindowDrawnDecorationsTemplate>
-        </Setter>
-        
-        <Style Selector="^ /template/ Button#PART_CloseButton:pointerover">
-            <Setter Property="Foreground" Value="{DynamicResource CaptionButtonCloseForeground}" />
-            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePointeroverBackground}" />
-        </Style>
-        <Style Selector="^ /template/ Button#PART_CloseButton:pressed">
-            <Setter Property="Foreground" Value="{DynamicResource CaptionButtonCloseForeground}" />
-            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePressedBackground}" />
-        </Style>
-        
-        <!--  Shadow: inset border and add drop shadow  -->
-        <Style Selector="^:has-shadow /template/ Panel#PART_UnderlayWrapper">
-            <Setter Property="Margin" Value="{TemplateBinding ShadowThickness}" />
-        </Style>
-        <Style Selector="^:has-shadow /template/ Border#PART_WindowBorder">
-            <Setter Property="BoxShadow" Value="0 2 10 2 #80000000" />
-        </Style>
-        <Style Selector="^:has-shadow /template/ Panel#PART_OverlayWrapper">
-            <Setter Property="Margin" Value="{TemplateBinding ShadowThickness}" />
-        </Style>
-        
-        <!-- Maximized: restore button path changes -->
-        <Style Selector="^:maximized /template/ Path#PART_MaximizeButtonIcon">
-            <Setter Property="Data" Value="{StaticResource WindowRestoreGlyph}" />
-        </Style>
-
-        <!--  Border: inset titlebar and buttons inside frame  -->
-        <Style Selector="^:has-border /template/ Panel#PART_TitleTextPanel">
-            <Setter Property="Margin" Value="1,1,1,0" />
-        </Style>
-        <Style Selector="^:has-border /template/ Panel#PART_TitleBar">
-            <Setter Property="Margin" Value="1,1,1,0" />
-        </Style>
-        <Style Selector="^:has-border /template/ StackPanel#PART_OverlayPanel">
-            <Setter Property="Margin" Value="0,1,1,0" />
-        </Style>
-        
-        <!--  Fullscreen: hide overlay and titlebar (popover takes over)  -->
-        <Style Selector="^:fullscreen /template/ Panel#PART_TitleTextPanel">
-            <Setter Property="IsVisible" Value="False" />
-        </Style>
-        <Style Selector="^:fullscreen /template/ StackPanel#PART_OverlayPanel">
-            <Setter Property="IsVisible" Value="False" />
-        </Style>
-        <Style Selector="^:fullscreen /template/ Panel#PART_TitleBar">
-            <Setter Property="IsVisible" Value="False" />
-        </Style>
-    </ControlTheme>
-</ResourceDictionary>

src/Semi.Avalonia/Controls/_index.axaml

@@ -9,10 +9,10 @@
         <ResourceInclude Source="ButtonSpinner.axaml" />
         <ResourceInclude Source="Calendar.axaml" />
         <ResourceInclude Source="CalendarDatePicker.axaml" />
+        <ResourceInclude Source="CaptionButtons.axaml" />
         <ResourceInclude Source="Carousel.axaml" />
         <ResourceInclude Source="CheckBox.axaml" />
         <ResourceInclude Source="ComboBox.axaml" />
-        <ResourceInclude Source="CommandBar.axaml" />
         <ResourceInclude Source="ContextMenu.axaml" />
         <ResourceInclude Source="DataValidationErrors.axaml" />
         <ResourceInclude Source="DatePicker.axaml" />
@@ -51,13 +51,13 @@
         <ResourceInclude Source="TextBox.axaml" />
         <ResourceInclude Source="ThemeVariantScope.axaml" />
         <ResourceInclude Source="TimePicker.axaml" />
+        <ResourceInclude Source="TitleBar.axaml" />
         <ResourceInclude Source="ToggleButton.axaml" />
         <ResourceInclude Source="ToggleSwitch.axaml" />
         <ResourceInclude Source="Tooltip.axaml" />
         <ResourceInclude Source="TransitioningContentControl.axaml" />
         <ResourceInclude Source="TreeView.axaml" />
         <ResourceInclude Source="Window.axaml" />
-        <ResourceInclude Source="WindowDrawnDecorations.axaml" />
         <ResourceInclude Source="WindowNotificationManager.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>

src/Semi.Avalonia/Semi.Avalonia.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
-        <Version>12.0.0-preview1</Version>
-        <PackageReleaseNotes>Update to Semi.Avalonia 12.0.0-preview1</PackageReleaseNotes>
+        <TargetFramework>net8.0</TargetFramework>
+        <Version>11.3.7.2</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia 11.3.7.2</PackageReleaseNotes>
         <Title>Semi.Avalonia</Title>
     </PropertyGroup>
 

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

@@ -1,22 +0,0 @@
-<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" />
-    <!--  AppBarSeparator  -->
-    <StaticResource x:Key="AppBarSeparatorBackground" ResourceKey="SemiColorBorder" />
-    <!--  CommandBar  -->
-    <StaticResource x:Key="CommandBarBackground" ResourceKey="SemiColorBackground1" />
-    <StaticResource x:Key="CommandBarForeground" ResourceKey="SemiColorText0" />
-    <StaticResource x:Key="CommandBarBorderBrush" ResourceKey="SemiColorBorder" />
-    <!--  CommandBar overflow popup  -->
-    <StaticResource x:Key="CommandBarOverflowBackground" ResourceKey="SemiColorBackground3" />
-    <StaticResource x:Key="CommandBarOverflowBorderBrush" ResourceKey="SemiColorBorder" />
-    <StaticResource x:Key="CommandBarOverflowBoxShadow" ResourceKey="SemiShadowElevated" />
-</ResourceDictionary>

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

@@ -11,7 +11,6 @@
         <ResourceInclude Source="Carousel.axaml" />
         <ResourceInclude Source="CheckBox.axaml" />
         <ResourceInclude Source="ComboBox.axaml" />
-        <ResourceInclude Source="CommandBar.axaml" />
         <ResourceInclude Source="DataValidationErrors.axaml" />
         <ResourceInclude Source="DatePicker.axaml" />
         <ResourceInclude Source="DateTimePickerShared.axaml" />

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

@@ -1,21 +0,0 @@
-<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" />
-    <!--  AppBarSeparator  -->
-    <StaticResource x:Key="AppBarSeparatorBackground" ResourceKey="SemiColorWindowText" />
-    <!--  CommandBar  -->
-    <StaticResource x:Key="CommandBarBackground" ResourceKey="SemiColorWindow" />
-    <StaticResource x:Key="CommandBarForeground" ResourceKey="SemiColorWindowText" />
-    <StaticResource x:Key="CommandBarBorderBrush" ResourceKey="SemiColorWindowText" />
-    <!--  CommandBar overflow popup  -->
-    <StaticResource x:Key="CommandBarOverflowBackground" ResourceKey="SemiColorWindow" />
-    <StaticResource x:Key="CommandBarOverflowBorderBrush" ResourceKey="SemiColorWindowText" />
-</ResourceDictionary>

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

@@ -11,7 +11,6 @@
         <ResourceInclude Source="Carousel.axaml" />
         <ResourceInclude Source="CheckBox.axaml" />
         <ResourceInclude Source="ComboBox.axaml" />
-        <ResourceInclude Source="CommandBar.axaml" />
         <ResourceInclude Source="DataValidationErrors.axaml" />
         <ResourceInclude Source="DatePicker.axaml" />
         <ResourceInclude Source="DateTimePickerShared.axaml" />

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

@@ -1,22 +0,0 @@
-<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" />
-    <!--  AppBarSeparator  -->
-    <StaticResource x:Key="AppBarSeparatorBackground" ResourceKey="SemiColorBorder" />
-    <!--  CommandBar  -->
-    <StaticResource x:Key="CommandBarBackground" ResourceKey="SemiColorBackground1" />
-    <StaticResource x:Key="CommandBarForeground" ResourceKey="SemiColorText0" />
-    <StaticResource x:Key="CommandBarBorderBrush" ResourceKey="SemiColorBorder" />
-    <!--  CommandBar overflow popup  -->
-    <StaticResource x:Key="CommandBarOverflowBackground" ResourceKey="SemiColorBackground3" />
-    <StaticResource x:Key="CommandBarOverflowBorderBrush" ResourceKey="SemiColorBorder" />
-    <StaticResource x:Key="CommandBarOverflowBoxShadow" ResourceKey="SemiShadowElevated" />
-</ResourceDictionary>

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

@@ -11,7 +11,6 @@
         <ResourceInclude Source="Carousel.axaml" />
         <ResourceInclude Source="CheckBox.axaml" />
         <ResourceInclude Source="ComboBox.axaml" />
-        <ResourceInclude Source="CommandBar.axaml" />
         <ResourceInclude Source="DataValidationErrors.axaml" />
         <ResourceInclude Source="DatePicker.axaml" />
         <ResourceInclude Source="DateTimePickerShared.axaml" />

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

@@ -1,29 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  AppBarButton / AppBarToggleButton  -->
-    <x:Double x:Key="AppBarButtonWidth">68</x:Double>
-    <x:Double x:Key="AppBarButtonCompactWidth">40</x:Double>
-    <x:Double x:Key="AppBarButtonMinHeight">40</x:Double>
-    <x:Double x:Key="AppBarButtonIconSize">20</x:Double>
-    <Thickness x:Key="AppBarButtonPadding">8 4</Thickness>
-    <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>
-    <!--  CommandBar  -->
-    <x:Double x:Key="CommandBarMinHeight">48</x:Double>
-    <Thickness x:Key="CommandBarPadding">4 0</Thickness>
-    <StaticResource x:Key="CommandBarCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
-    <StaticResource x:Key="CommandBarBorderThickness" ResourceKey="SemiBorderThicknessControl" />
-    <!--  CommandBar overflow popup  -->
-    <StaticResource x:Key="CommandBarOverflowCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
-    <Thickness x:Key="CommandBarOverflowPadding">0 4</Thickness>
-    <x:Double x:Key="CommandBarOverflowMinWidth">160</x:Double>
-    <!--  Overflow button glyph  -->
-    <StaticResource x:Key="CommandBarOverflowButtonGlyph" ResourceKey="SemiIconMore" />
-</ResourceDictionary>

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

@@ -3,9 +3,9 @@
     <StaticResource x:Key="TextBoxSmallHeight" ResourceKey="SemiHeightControlSmall" />
     <StaticResource x:Key="TextBoxLargeHeight" ResourceKey="SemiHeightControlLarge" />
     <StaticResource x:Key="TextBoxDefaultCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
-    <Thickness x:Key="TextBoxInnerLeftContentPadding">0 0 12 0</Thickness>
-    <Thickness x:Key="TextBoxInnerRightContentPadding">12 0 0 0</Thickness>
-    <Thickness x:Key="TextBoxContentPadding">12 0</Thickness>
+    <Thickness x:Key="TextBoxInnerLeftContentPadding">0 0 8 0</Thickness>
+    <Thickness x:Key="TextBoxInnerRightContentPadding">8 0 0 0</Thickness>
+    <Thickness x:Key="TextBoxContentPadding">8 0</Thickness>
     <StaticResource x:Key="TextBoxBorderThickness" ResourceKey="SemiBorderThicknessControl" />
     <Thickness x:Key="TextBoxTextAreaContentPadding">12 5</Thickness>
     <x:Double x:Key="TextBoxTextAreaHeight">90</x:Double>

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

@@ -11,7 +11,6 @@
         <ResourceInclude Source="Carousel.axaml" />
         <ResourceInclude Source="CheckBox.axaml" />
         <ResourceInclude Source="ComboBox.axaml" />
-        <ResourceInclude Source="CommandBar.axaml" />
         <ResourceInclude Source="DataValidationErrors.axaml" />
         <ResourceInclude Source="DatePicker.axaml" />
         <ResourceInclude Source="DateTimePickerShared.axaml" />

src/Semi.Avalonia/Tokens/Variables.axaml

@@ -67,7 +67,7 @@
     <FontWeight x:Key="SemiFontWeightRegular">400</FontWeight> <!-- 字重 - 常规 -->
     <FontWeight x:Key="SemiFontWeightBold">600</FontWeight> <!-- 字重 - 粗 -->
     <FontFamily x:Key="SemiFontFamilyRegular">
-        fonts:Inter#Inter, Inter, -apple-system, BlinkMacSystemFont, PingFang SC,
+        Inter, -apple-system, BlinkMacSystemFont, PingFang SC,
         Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue,
         Helvetica, Arial, sans-serif
     </FontFamily>