Merge branch 'main' into release

11.0 release

.github/workflows/Pack.yml

@@ -2,16 +2,16 @@ name: Pack
 
 on:
   push:
-    branches: [ "action/pack" ]
+    branches: [ "release" ]
   pull_request:
-    branches: [ "action/pack" ]
+    branches: [ "release" ]
 
 jobs:
   nuget_desktop:
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3
 
       - name: Nuget Semi.Avalonia
         run: dotnet pack ./src/Semi.Avalonia -o ./nugets
@@ -28,8 +28,8 @@ jobs:
       - name: Desktop
         run: dotnet publish ./demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true --self-contained true
 
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.3.1
+      - name: Upload
+        uses: actions/upload-artifact@v3.1.2
         with:
           name: nuget_desktop
           path: |
@@ -40,7 +40,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v3
 
       - name: CD Android
         run: cd ./demo/Semi.Avalonia.Demo.Android
@@ -52,7 +52,7 @@ jobs:
         run: dotnet publish ./demo/Semi.Avalonia.Demo.Android -c Release -f net7.0-android --no-restore
 
       - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.3.1
+        uses: actions/upload-artifact@v3.1.2
         with:
           name: android
           path: ./**/publish/*Signed.apk

.github/workflows/deploy.yml

@@ -1,53 +1,50 @@
 name: Deploy to GitHub Pages
 
 env:
-  PROJECT_PATH: demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
-  OUTPUT_PATH: demo/Semi.Avalonia.Demo.Web/bin/Release/net7.0/browser-wasm/AppBundle
+    PROJECT_PATH: demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
+    OUTPUT_PATH: demo/Semi.Avalonia.Demo.Web/bin/Debug/net7.0/browser-wasm/AppBundle
 on:
   push:
-    branches: [ "action/deploy" ]
+    branches: [ "deploy" ]
   pull_request:
-    branches: [ "action/deploy" ]
+    branches: [ "deploy" ]
 
 jobs:
   deploy-to-github-pages:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v2
 
-      - name: Setup .NET 7
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 7.0.405
+    - name: Setup .NET Core SDK
+      uses: actions/setup-dotnet@v1.9.0
 
-      - name: Install wasm-tools
-        run: dotnet workload install wasm-tools wasm-tools-net7
+    - name: Install wasm-tools
+      run: dotnet workload install wasm-tools wasm-experimental
 
-      - name: Install DotNetCompress
-        run: dotnet tool install --global DotNetCompress --version 3.0.0 --no-cache
+    - name: Install DotNetCompress
+      run: dotnet tool install --global DotNetCompress --version 2.0.0 --no-cache
 
-      - name: Publish .NET Project
-        run: dotnet publish $PROJECT_PATH -c Release -o release --nologo
+    - name: Publish .NET Project
+      run: dotnet publish $PROJECT_PATH -c Debug -o debug --nologo
 
-      - name: Change base-tag in index.html
-        run: sed -i 's/<base href="\/" \/>/<base href="\/Semi.Avalonia\/" \/>/g' $OUTPUT_PATH/index.html
+    - name: Change base-tag in index.html
+      run: sed -i 's/<base href="\/" \/>/<base href="\/Semi.Avalonia\/" \/>/g' $OUTPUT_PATH/index.html
 
-      - name: copy index.html to 404.html
-        run: cp $OUTPUT_PATH/index.html $OUTPUT_PATH/404.html
+    - name: copy index.html to 404.html
+      run: cp $OUTPUT_PATH/index.html $OUTPUT_PATH/404.html
 
-      - name: Compress Output using Brotli
-        run: DotNetCompress -d $OUTPUT_PATH -p "*.dll" "*.js" "*.wasm" --format br --threads 4
+    - name: Compress Output using Brotli
+      run: DotNetCompress -d $OUTPUT_PATH -p "*.dll" "*.js" "*.wasm" --format br --threads 4
 
-      - name: Compress Output using GZip
-        run: DotNetCompress -d $OUTPUT_PATH -p "*.dll" "*.js" "*.wasm" --format gz --threads 4
+    - name: Compress Output using GZip
+      run: DotNetCompress -d $OUTPUT_PATH -p "*.dll" "*.js" "*.wasm" --format gz --threads 4
 
-      - name: Add .nojekyll file
-        run: touch $OUTPUT_PATH/.nojekyll
+    - name: Add .nojekyll file
+      run: touch $OUTPUT_PATH/.nojekyll
 
-      - name: Commit wwwroot to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4.5.0
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages
-          FOLDER: ${{ env.OUTPUT_PATH }}
+    - name: Commit wwwroot to GitHub Pages
+      uses: JamesIves/github-pages-deploy-action@4.1.7
+      with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        BRANCH: gh-pages
+        FOLDER: ${{ env.OUTPUT_PATH }}

README.md

@@ -9,7 +9,7 @@ Avalonia Theme inspired by Semi Design
 
 ## Installation
 ```bash
-dotnet add package Semi.Avalonia --version 11.0.7
+dotnet add package Semi.Avalonia --version 11.0.1
 ```
 Include Semi Design Styles in application:
 
@@ -23,9 +23,9 @@ That's all.
 
 ColorPicker, DataGrid and TreeDataGrid are distributed in separated packages. Please install if you need. 
 ```bash
-dotnet add package Semi.Avalonia.ColorPicker --version 11.0.7
-dotnet add package Semi.Avalonia.DataGrid --version 11.0.7
-dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.7
+dotnet add package Semi.Avalonia.ColorPicker --version 11.0.1
+dotnet add package Semi.Avalonia.DataGrid --version 11.0.1
+dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.1
 ```
 ```xaml
 <Application.Styles>
@@ -44,8 +44,7 @@ https://github.com/irihitech/Semi.Avalonia/releases
 
 | Semi Design Version | Avalonia Version |
 |:--------------------|:-----------------|
-| 11.0.7              | 11.0.7           |
-| 11.0.1              | <=11.0.6         |
+| 11.0.x              | 11.0.x           |
 
 ## TODO
 * FocusAdorner

demo/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.0.7</AvaloniaVersion>
+    <AvaloniaVersion>11.0.0</AvaloniaVersion>
   </PropertyGroup>
 </Project>

demo/Semi.Avalonia.Demo.Drm/Program.cs

@@ -1,53 +1,59 @@
-using System;
-using System.Globalization;
+using Avalonia;
+using Avalonia.Dialogs;
+using Avalonia.Media;
+using System;
 using System.Linq;
 using System.Threading;
-using Avalonia;
 
-namespace Semi.Avalonia.Demo.Drm;
-
-class Program
+namespace Semi.Avalonia.Demo.Drm
 {
-    // Initialization code. Don't use any Avalonia, third-party APIs or any
-    // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
-    // yet and stuff might break.
-    [STAThread]
-    public static int Main(string[] args)
+    internal class Program
     {
-        var builder = BuildAvaloniaApp();
-
-        double GetScaling()
+        // Initialization code. Don't use any Avalonia, third-party APIs or any
+        // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
+        // yet and stuff might break.
+        [STAThread]
+        public static void Main(string[] args)
         {
-            var idx = Array.IndexOf(args, "--scaling");
-            if (idx != 0 && args.Length > idx + 1 &&
-                double.TryParse(args[idx + 1], NumberStyles.Any, CultureInfo.InvariantCulture, out var scaling))
-                return scaling;
-            return 1;
+            var builder = BuildAvaloniaApp();
+            builder.With(new FontManagerOptions
+            {
+                FontFallbacks = new[]
+                {
+                new FontFallback
+                {
+                    FontFamily = new FontFamily("Microsoft YaHei")
+                }
+            }
+            });
+            if (args.Contains("--drm"))
+            {
+                SilenceConsole();
+                builder.StartLinuxDrm(args: args, card: "/dev/dri/card0", scaling: 1);
+            }
+            else
+            {
+                builder.StartWithClassicDesktopLifetime(args);
+            }
         }
 
-        if (args.Contains("--drm"))
+        // Avalonia configuration, don't remove; also used by visual designer.
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>()
+                .UseManagedSystemDialogs()
+                .UsePlatformDetect()
+                .With(new Win32PlatformOptions())
+                .LogToTrace();
+
+        private static void SilenceConsole()
         {
-            SilenceConsole();
-            return builder.StartLinuxDrm(args: args, card: "/dev/dri/card1", scaling: GetScaling());
-        }
-
-        return builder.StartWithClassicDesktopLifetime(args);
-    }
-
-    // Avalonia configuration, don't remove; also used by visual designer.
-    public static AppBuilder BuildAvaloniaApp()
-        => AppBuilder.Configure<App>()
-            .UsePlatformDetect()
-            .LogToTrace();
-
-    private static void SilenceConsole()
-    {
-        new Thread(() =>
+            new Thread(() =>
             {
                 Console.CursorVisible = false;
                 while (true)
                     Console.ReadKey(true);
             })
             { IsBackground = true }.Start();
+        }
     }
 }

demo/Semi.Avalonia.Demo.Drm/使用方法.md

@@ -1,23 +1,18 @@
 # DRM启动步骤
 
-(Ubuntu18.04Server版本 虚拟机测试OK)  
-(Orange Pi Zero2 Ubuntu20.04-arm64 测试OK)
+(Ubuntu18.04Server版本 虚拟机测试OK)
 
 Avalonia官方参考文档：https://docs.avaloniaui.net/docs/next/guides/platforms/rpi/running-on-raspbian-lite-via-drm
 
-1.Linux端运行命令  
-```
-sudo apt update  
-sudo apt upgrade  
-sudo reboot  
-sudo apt - get install libgbm1 libgl1 - mesa - dri libegl1 - mesa libinput10
-```
+1.Linux端运行命令
+ sudo apt update
+ sudo apt upgrade
+ sudo reboot
+ sudo apt - get install libgbm1 libgl1 - mesa - dri libegl1 - mesa libinput10
 
-2.安装测试工具测试(出现一个彩色立方体说明环境安装完成)  
-```
-sudo apt-get install kmscube
-sudo kmscube
-```
+2.安装测试工具测试(出现一个彩色立方体说明环境安装完成)
+ sudo apt-get install kmscube
+ sudo kmscube
 
 3.安装.net运行时(参考网址：https://learn.microsoft.com/zh-cn/dotnet/core/install/linux?WT.mc_id=dotnet-35129-website)
 
@@ -36,7 +31,7 @@ sudo kmscube
 >Unhandled exception. Avalonia.Markup.Xaml.XamlLoadException: No precompiled XAML found for avares://Semi.Avalonia/Themes/Light/Light.axaml (baseUri: avares://Semi.Avalonia/Themes/Index.axaml), make sure to specify x:Class and include your XAML file as AvaloniaResource
 
  解决方法：
->如果使用Semi发布文件不要裁剪，如果裁剪会报错
+    如果使用Semi发布文件不要裁剪，如果裁剪会报错
          
 
 2. 报错内容
@@ -46,32 +41,11 @@ sudo kmscube
     at SkiaSharp.SKImageInfo..cctor()
 
 解决方法：
->Linux命令行安装一下 apt-get install -y libfontconfig1  
-参考网址：https://github.com/mono/SkiaSharp/issues/509
+    Linux命令行安装一下 apt-get install -y libfontconfig1
+    参考网址：https://github.com/mono/SkiaSharp/issues/509
 
 3. 报错内容
 >Permission denied
 
-解决方法：  
->sudo chmod +x ./Semi.Avalonia.Demo.Drm
-
-4. 报错内容
->Unhandled exception. System.ComponentModel.Win32Exception (95): drmModeGetResources failed
-at Avalonia.LinuxFramebuffer.Output.DrmResources..ctor(Int32 fd, Boolean connectorsForceProbe) in /_/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs:line 91
-at Avalonia.LinuxFramebuffer.Output.DrmCard.GetResources(Boolean connectorsForceProbe) in /_/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs:line 171
-at Avalonia.LinuxFramebuffer.Output.DrmOutput..ctor(String path, Boolean connectorsForceProbe, DrmOutputOptions options) in /_/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs:line 60
-at LinuxFramebufferPlatformExtensions.StartLinuxDrm(AppBuilder builder, String[] args, String card, Double scaling, IInputBackend inputBackend) in /_/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs:line 166
-at Semi.Avalonia.Demo.Drm.Program.Main(String[] args)
-
 解决方法：
->`program.cs`的显卡路径错误，可能不是`dev/dri/card1`，看在`dev/dri`目录下有无其他的显卡如`card0`。
-
-5. 报错内容
->Unhandled exception. System.ComponentModel.Win32Exception (2): Couldn't open /dev/dri/card1
-at Avalonia.LinuxFramebuffer.Output.DrmCard..ctor(String ) in /_/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs:line 167
-at Avalonia.LinuxFramebuffer.Output.DrmOutput..ctor(String , Boolean , DrmOutputOptions ) in /_/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs:line 58
-at LinuxFramebufferPlatformExtensions.StartLinuxDrm(AppBuilder, String[], String , Double , IInputBackend ) in /_/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs:line 166
-at Semi.Avalonia.Demo.Drm.Program.Main(String[])
-
-解决办法：
->找不到显卡路径`dev/dri/card1`，可能是显卡挂载到别的文件夹下了，待解决。
+    sudo chmod +x ./Semi.Avalonia.Demo.Drm

demo/Semi.Avalonia.Demo/App.axaml

@@ -1,13 +1,9 @@
 <Application
     x:Class="Semi.Avalonia.Demo.App"
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:semi="https://irihi.tech/semi">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Styles>
-        <!-- You can still reference in old way. 
         <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
-         -->
-        <semi:SemiTheme Locale="zh-CN"/>
         <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
         <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
     </Application.Styles>

demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml

@@ -5,7 +5,7 @@
     xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels"
     x:CompileBindings="True"
     x:DataType="viewModels:ColorItemViewModel">
-    <StreamGeometry x:Key="CopyIcon">M5 7C3.89543 7 3 7.89543 3 9V19C3 20.1046 3.89543 21 5 21H15C16.1046 21 17 20.1046 17 19V9C17 7.89543 16.1046 7 15 7H5Z,M7 4C7 2.89543 7.89543 2 9 2H20C21.1046 2 22 2.89543 22 4V15C22 16.1046 21.1046 17 20 17H19V8C19 6 18 5 16 5H7V4Z</StreamGeometry>
+    <PathGeometry x:Key="CopyIcon">M5 7C3.89543 7 3 7.89543 3 9V19C3 20.1046 3.89543 21 5 21H15C16.1046 21 17 20.1046 17 19V9C17 7.89543 16.1046 7 15 7H5Z,M7 4C7 2.89543 7.89543 2 9 2H20C21.1046 2 22 2.89543 22 4V15C22 16.1046 21.1046 17 20 17H19V8C19 6 18 5 16 5H7V4Z</PathGeometry>
     <ControlTheme x:Key="{x:Type controls:ColorDetailControl}" TargetType="controls:ColorDetailControl">
         <!--  Add Resources Here  -->
         <Setter Property="controls:ColorDetailControl.Template">

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

@@ -9,7 +9,6 @@
     mc:Ignorable="d">
     <StackPanel HorizontalAlignment="Left" Spacing="20">
         <CalendarDatePicker />
-        <CalendarDatePicker Classes="ClearButton" Width="200" />
         <CalendarDatePicker Width="500" />
         <CalendarDatePicker Classes="Large" />
         <CalendarDatePicker Classes="Small" />

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

@@ -52,22 +52,5 @@
                 <TextBlock Text="Text 4" />
             </Border>
         </Carousel>
-        <Carousel Classes="Columnar Left" Theme="{DynamicResource FullCarousel}">
-            <Carousel.PageTransition>
-                <PageSlide Orientation="Horizontal" Duration="0.25" />
-            </Carousel.PageTransition>
-            <Border Background="#EAF5FF">
-                <TextBlock Text="Text 1" />
-            </Border>
-            <Border Background="#F9F9F9">
-                <TextBlock Text="Text 2" />
-            </Border>
-            <Border Background="#FFF8EA">
-                <TextBlock Text="Text 3" />
-            </Border>
-            <Border Background="#FEF2ED">
-                <TextBlock Text="Text 4" />
-            </Border>
-        </Carousel>
     </StackPanel>
 </UserControl>

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

@@ -15,13 +15,6 @@
             <ComboBoxItem>Mr. 17</ComboBoxItem>
             <ComboBoxItem>Cass</ComboBoxItem>
         </ComboBox>
-        <ComboBox Width="150" Classes="ClearButton">
-            <ComboBoxItem>Ding</ComboBoxItem>
-            <ComboBoxItem>Otter</ComboBoxItem>
-            <ComboBoxItem>Husky</ComboBoxItem>
-            <ComboBoxItem>Mr. 17</ComboBoxItem>
-            <ComboBoxItem>Cass</ComboBoxItem>
-        </ComboBox>
         <ComboBox Width="150" PlaceholderText="Please Select">
             <ComboBoxItem>Ding</ComboBoxItem>
             <ComboBoxItem>Otter</ComboBoxItem>

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

@@ -13,48 +13,43 @@
     mc:Ignorable="d">
     <TabControl>
         <TabItem Header="DataGrid">
-           <Grid RowDefinitions="Auto, *">
-               <ToggleSwitch Grid.Row="0" Content="Disable" Name="DisableToggle"></ToggleSwitch>
-               <DataGrid Grid.Row="1"
-                         Margin="8"
-                         CanUserReorderColumns="True"
-                         CanUserResizeColumns="True"
-                         CanUserSortColumns="True"
-                         HeadersVisibility="All"
-                         IsReadOnly="True"
-                         IsEnabled="{Binding #DisableToggle.IsChecked}"
-                         ItemsSource="{Binding GridData1}">
-                   <DataGrid.Columns>
-                       <DataGridTextColumn
-                           Width="6*"
-                           x:DataType="vm:Song"
-                           Binding="{Binding Title}"
-                           Header="Title" />
-                       <DataGridTextColumn
-                           Width="6*"
-                           x:DataType="vm:Song"
-                           Binding="{Binding Artist}"
-                           Header="Artist" />
-                       <DataGridTextColumn
-                           Width="6*"
-                           x:DataType="vm:Song"
-                           Binding="{Binding Album}"
-                           Header="Album" />
-                       <DataGridTemplateColumn Header="Duration" SortMemberPath="Duration">
-                           <DataGridTemplateColumn.CellTemplate>
-                               <DataTemplate>
-                                   <TextBlock
-                                       Margin="8,0,0,0"
-                                       VerticalAlignment="Center"
-                                       Text="{Binding Duration}" />
-                               </DataTemplate>
-                           </DataGridTemplateColumn.CellTemplate>
-                       </DataGridTemplateColumn>
-                   </DataGrid.Columns>
+            <DataGrid
+                Margin="8"
+                CanUserReorderColumns="True"
+                CanUserResizeColumns="True"
+                CanUserSortColumns="True"
+                HeadersVisibility="All"
+                IsReadOnly="True"
+                ItemsSource="{Binding GridData1}">
+                <DataGrid.Columns>
+                    <DataGridTextColumn
+                        Width="6*"
+                        x:DataType="vm:Song"
+                        Binding="{Binding Title}"
+                        Header="Title" />
+                    <DataGridTextColumn
+                        Width="6*"
+                        x:DataType="vm:Song"
+                        Binding="{Binding Artist}"
+                        Header="Artist" />
+                    <DataGridTextColumn
+                        Width="6*"
+                        x:DataType="vm:Song"
+                        Binding="{Binding Album}"
+                        Header="Album" />
+                    <DataGridTemplateColumn Header="Duration" SortMemberPath="Duration">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock
+                                    Margin="8,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Text="{Binding Duration}" />
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                </DataGrid.Columns>
 
-               </DataGrid>
-               
-           </Grid>
+            </DataGrid>
         </TabItem>
         <TabItem Header="Grouping">
             <DataGrid
@@ -167,7 +162,6 @@
                     Grid.Row="2"
                     Margin="12,0,12,12"
                     HorizontalAlignment="Right"
-                    Command="{Binding AddCommand}"
                     Content="Add" />
             </Grid>
         </TabItem>

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

@@ -9,7 +9,6 @@
     mc:Ignorable="d">
     <StackPanel Spacing="20">
         <DatePicker />
-        <DatePicker Classes="ClearButton" />
         <DatePicker DayFormat="d (ddd)" YearVisible="False" />
         <DatePicker IsEnabled="False" />
         <DatePicker Classes="Large" />

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

@@ -6,32 +6,7 @@
              x:Class="Semi.Avalonia.Demo.Pages.HeaderedContentControlDemo">
     <ScrollViewer>
         <StackPanel HorizontalAlignment="Left" Spacing="20">
-            <TextBlock>Default Theme</TextBlock>
-            <WrapPanel ItemWidth="400">
-                <HeaderedContentControl
-                    Header="This is the text header!"
-                    BorderBrush="Gray"
-                    BorderThickness="1"
-                    CornerRadius="4">
-                    <TextBlock Text="Some content" />
-                </HeaderedContentControl>
-                <HeaderedContentControl Header="This is the image header!">
-                    <Image Source="/Assets/WORLD.png" />
-                </HeaderedContentControl>
-                <HeaderedContentControl>
-                    <HeaderedContentControl.Header>
-                        <Image Source="/Assets/WORLD.png" />
-                    </HeaderedContentControl.Header>
-                    <TextBlock Text="This is the content. But the header can also be non textual" />
-                </HeaderedContentControl>
-            </WrapPanel>
-            <TextBlock>GroupBox Theme</TextBlock>
-            <HeaderedContentControl
-                HorizontalAlignment="Left"
-                Theme="{DynamicResource GroupBox}"
-                Header="Semi Design"
-                Width="400"
-                Height="200">
+            <HeaderedContentControl Theme="{DynamicResource GroupBox}" Header="Semi Design" Width="400" Height="200">
                 <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。</TextBlock>
             </HeaderedContentControl>
         </StackPanel>

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

@@ -38,9 +38,9 @@
                             <TextBlock Grid.Row="3" Grid.Column="0">Secondary</TextBlock>
                             <TextBlock Grid.Row="4" Grid.Column="0">Tertiary</TextBlock>
                             <TextBlock Grid.Row="5" Grid.Column="0">Quaternary</TextBlock>
-                            <TextBlock Grid.Row="6" Grid.Column="0">Success</TextBlock>
-                            <TextBlock Grid.Row="7" Grid.Column="0">Warning</TextBlock>
-                            <TextBlock Grid.Row="8" Grid.Column="0">Danger</TextBlock>
+                            <TextBlock Grid.Row="6" Grid.Column="0">Warning</TextBlock>
+                            <TextBlock Grid.Row="7" Grid.Column="0">Danger</TextBlock>
+                            <TextBlock Grid.Row="8" Grid.Column="0">Success</TextBlock>
                             <TextBlock Grid.Row="9" Grid.Column="0">Mark</TextBlock>
                             <TextBlock Grid.Row="10" Grid.Column="0">Code</TextBlock>
                             <Label Grid.Row="2" Grid.Column="1">Text</Label>
@@ -65,21 +65,21 @@
                             <Label
                                 Grid.Row="6"
                                 Grid.Column="1"
-                                Classes="Success">
-                                Success
-                            </Label>
-                            <Label
-                                Grid.Row="7"
-                                Grid.Column="1"
                                 Classes="Warning">
                                 Warning
                             </Label>
                             <Label
-                                Grid.Row="8"
+                                Grid.Row="7"
                                 Grid.Column="1"
                                 Classes="Danger">
                                 Danger
                             </Label>
+                            <Label
+                                Grid.Row="8"
+                                Grid.Column="1"
+                                Classes="Success">
+                                Success
+                            </Label>
                             <Label
                                 Grid.Row="9"
                                 Grid.Column="1"

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

@@ -8,7 +8,6 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <Button Click="InfoButton_OnClick" Content="Default" />
         <Button Click="InfoButton_OnClick" Content="Information" />
         <Button Click="InfoButton_OnClick" Content="Success" />
         <Button Click="InfoButton_OnClick" Content="Warning" />

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

@@ -2,14 +2,17 @@ using System;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
+using Avalonia.Controls.Presenters;
 using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
+using Semi.Avalonia.Demo.Views;
 
 namespace Semi.Avalonia.Demo.Pages;
 
 public partial class NotificationDemo : UserControl
 {
     private WindowNotificationManager? _manager;
-
     public NotificationDemo()
     {
         InitializeComponent();
@@ -19,16 +22,14 @@ public partial class NotificationDemo : UserControl
     {
         base.OnAttachedToVisualTree(e);
         var topLevel = TopLevel.GetTopLevel(this);
-        _manager = new WindowNotificationManager(topLevel) { MaxItems = 3 };
+        _manager = new WindowNotificationManager(topLevel){ MaxItems = 3};
     }
 
     private void InfoButton_OnClick(object? sender, RoutedEventArgs e)
     {
-        if (sender is Button b && b.Content is string s)
+        if (sender is Button b && b.Content is string s && Enum.TryParse<NotificationType>(s, out NotificationType t))
         {
-            _manager?.Show(Enum.TryParse<NotificationType>(s, out NotificationType t)
-                ? new Notification(t.ToString(), "This is message", t)
-                : new Notification(s, "This is message"));
+            _manager?.Show(new Notification(t.ToString(), "This is message", t));
         }
     }
 }

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

@@ -13,7 +13,7 @@ public partial class Overview : UserControl
         InitializeComponent();
     }
 
-    public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.0.7";
+    public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.0.1";
 
     public string MainStyle { get; set; } = """
 <Application.Styles>
@@ -21,7 +21,7 @@ public partial class Overview : UserControl
 </Application.Styles>
 """;
 
-    public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.0.7";
+    public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.0.1";
 
     public string ColorPickerStyle { get; set; } = """
 <Application.Styles>
@@ -29,7 +29,7 @@ public partial class Overview : UserControl
 </Application.Styles>
 """;
 
-    public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.0.7";
+    public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.0.1";
 
     public string DataGridStyle { get; set; } = """
 <Application.Styles>
@@ -37,7 +37,7 @@ public partial class Overview : UserControl
 </Application.Styles>
 """;
 
-    public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.7";
+    public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.1";
 
     public string TreeDataGridStyle { get; set; } = """
 <Application.Styles>

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

@@ -1,22 +0,0 @@
-<UserControl
-    x:Class="Semi.Avalonia.Demo.Pages.PathIconDemo"
-    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="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    <StackPanel HorizontalAlignment="Left" >
-        <TextBlock Text="Size"></TextBlock>
-        <Slider Name="width" Minimum="0" Maximum="100" Value="20" Width="300"></Slider>
-        <ToggleSwitch Name="active" Content="Active"></ToggleSwitch>
-        <PathIcon
-            Classes.Active="{Binding ElementName=active, Path=IsChecked}"
-            BorderBrush="{DynamicResource SemiRed6}"
-            Width="{Binding #width.Value}"
-            Height="{Binding #width.Value}"
-            Data="M12 3L2 12H5V20H19V12H22L12 3M13 18H11V16H13V18M13 14H11V8H13V14Z"
-            Foreground="{DynamicResource SemiBlue6}" />
-    </StackPanel>
-</UserControl>

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

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

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

@@ -31,9 +31,9 @@
                     <SelectableTextBlock Grid.Row="3" Grid.Column="0">Secondary</SelectableTextBlock>
                     <SelectableTextBlock Grid.Row="4" Grid.Column="0">Tertiary</SelectableTextBlock>
                     <SelectableTextBlock Grid.Row="5" Grid.Column="0">Quaternary</SelectableTextBlock>
-                    <SelectableTextBlock Grid.Row="6" Grid.Column="0">Success</SelectableTextBlock>
-                    <SelectableTextBlock Grid.Row="7" Grid.Column="0">Warning</SelectableTextBlock>
-                    <SelectableTextBlock Grid.Row="8" Grid.Column="0">Danger</SelectableTextBlock>
+                    <SelectableTextBlock Grid.Row="6" Grid.Column="0">Warning</SelectableTextBlock>
+                    <SelectableTextBlock Grid.Row="7" Grid.Column="0">Danger</SelectableTextBlock>
+                    <SelectableTextBlock Grid.Row="8" Grid.Column="0">Success</SelectableTextBlock>
                     <SelectableTextBlock Grid.Row="9" Grid.Column="0">Mark</SelectableTextBlock>
                     <SelectableTextBlock Grid.Row="10" Grid.Column="0">Underline</SelectableTextBlock>
                     <SelectableTextBlock Grid.Row="11" Grid.Column="0">Delete</SelectableTextBlock>
@@ -60,21 +60,21 @@
                     <SelectableTextBlock
                         Grid.Row="6"
                         Grid.Column="1"
-                        Classes="Success">
-                        Success
-                    </SelectableTextBlock>
-                    <SelectableTextBlock
-                        Grid.Row="7"
-                        Grid.Column="1"
                         Classes="Warning">
                         Warning
                     </SelectableTextBlock>
                     <SelectableTextBlock
-                        Grid.Row="8"
+                        Grid.Row="7"
                         Grid.Column="1"
                         Classes="Danger">
                         Danger
                     </SelectableTextBlock>
+                    <SelectableTextBlock
+                        Grid.Row="8"
+                        Grid.Column="1"
+                        Classes="Success">
+                        Success
+                    </SelectableTextBlock>
                     <SelectableTextBlock
                         Grid.Row="9"
                         Grid.Column="1"

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

@@ -4,92 +4,63 @@
     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"
-    xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels;assembly=Semi.Avalonia.Demo"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    x:CompileBindings="True"
-    x:DataType="vm:TabControlDemoViewModel"
     mc:Ignorable="d">
-    <ScrollViewer>
-        <StackPanel Spacing="20">
-            <Border Theme="{StaticResource CardBorder}">
-                <TabControl TabStripPlacement="Top">
-                    <TabItem Content="Hello 1" Header="Tab 1" />
-                    <TabItem Content="Hello 2" Header="Tab 2" />
-                    <TabItem Content="Hello 3" Header="Tab 3" />
-                    <TabItem Content="中文内容" Header="中文中文" />
-                    <TabItem
-                        Content="Hello 4"
-                        Header="Tab 4"
-                        IsEnabled="False" />
-                </TabControl>
-            </Border>
-            <Border Theme="{StaticResource CardBorder}">
-                <TabControl TabStripPlacement="Left">
-                    <TabItem Content="Hello 1" Header="Tab 1" />
-                    <TabItem Content="Hello 2" Header="Tab 2" />
-                    <TabItem Content="Hello 3" Header="Tab 3" />
-                    <TabItem Content="中文内容" Header="中文中文" />
-                    <TabItem
-                        Content="Hello 4"
-                        Header="Tab 4"
-                        IsEnabled="False" />
-                </TabControl>
-            </Border>
-            <Border Theme="{StaticResource CardBorder}">
-                <TabControl TabStripPlacement="Right">
-                    <TabItem Content="Hello 1" Header="Tab 1" />
-                    <TabItem Content="Hello 2" Header="Tab 2" />
-                    <TabItem Content="Hello 3" Header="Tab 3" />
-                    <TabItem Content="中文内容" Header="中文中文" />
-                    <TabItem
-                        Content="Hello 4"
-                        Header="Tab 4"
-                        IsEnabled="False" />
-                </TabControl>
-            </Border>
-            <Border Theme="{StaticResource CardBorder}">
-                <TabControl TabStripPlacement="Bottom">
-                    <TabItem Content="Hello 1" Header="Tab 1" />
-                    <TabItem Content="Hello 2" Header="Tab 2" />
-                    <TabItem Content="Hello 3" Header="Tab 3" />
-                    <TabItem Content="中文内容" Header="中文中文" />
-                    <TabItem
-                        Content="Hello 4"
-                        Header="Tab 4"
-                        IsEnabled="False" />
-                </TabControl>
-            </Border>
-            <Border Theme="{StaticResource CardBorder}">
-                <TabStrip>
-                    <TabStripItem>Tab 1</TabStripItem>
-                    <TabStripItem>Tab 2</TabStripItem>
-                </TabStrip>
-            </Border>
-            <Border Height="300" Theme="{DynamicResource CardBorder}">
-                <TabControl
-                    ItemsSource="{Binding Items}"
-                    TabStripPlacement="Top"
-                    Theme="{DynamicResource ScrollTabControl}" />
-            </Border>
-            <Border Height="300" Theme="{DynamicResource CardBorder}">
-                <TabControl
-                    ItemsSource="{Binding Items}"
-                    TabStripPlacement="Left"
-                    Theme="{DynamicResource ScrollTabControl}" />
-            </Border>
-            <Border Height="300" Theme="{DynamicResource CardBorder}">
-                <TabControl
-                    ItemsSource="{Binding Items}"
-                    TabStripPlacement="Bottom"
-                    Theme="{DynamicResource ScrollTabControl}" />
-            </Border>
-            <Border Height="300" Theme="{DynamicResource CardBorder}">
-                <TabControl
-                    ItemsSource="{Binding Items}"
-                    TabStripPlacement="Right"
-                    Theme="{DynamicResource ScrollTabControl}" />
-            </Border>
-        </StackPanel>
-    </ScrollViewer>
+    <StackPanel Spacing="20">
+        <Border Theme="{StaticResource CardBorder}">
+            <TabControl TabStripPlacement="Top">
+                <TabItem Content="Hello 1" Header="Tab 1" />
+                <TabItem Content="Hello 2" Header="Tab 2" />
+                <TabItem Content="Hello 3" Header="Tab 3" />
+                <TabItem Content="中文内容" Header="中文中文" />
+                <TabItem
+                    Content="Hello 4"
+                    Header="Tab 4"
+                    IsEnabled="False" />
+            </TabControl>
+        </Border>
+        <Border Theme="{StaticResource CardBorder}">
+            <TabControl TabStripPlacement="Left">
+                <TabItem Content="Hello 1" Header="Tab 1" />
+                <TabItem Content="Hello 2" Header="Tab 2" />
+                <TabItem Content="Hello 3" Header="Tab 3" />
+                <TabItem Content="中文内容" Header="中文中文" />
+                <TabItem
+                    Content="Hello 4"
+                    Header="Tab 4"
+                    IsEnabled="False" />
+            </TabControl>
+        </Border>
+        <Border Theme="{StaticResource CardBorder}">
+            <TabControl TabStripPlacement="Right">
+                <TabItem Content="Hello 1" Header="Tab 1" />
+                <TabItem Content="Hello 2" Header="Tab 2" />
+                <TabItem Content="Hello 3" Header="Tab 3" />
+                <TabItem Content="中文内容" Header="中文中文" />
+                <TabItem
+                    Content="Hello 4"
+                    Header="Tab 4"
+                    IsEnabled="False" />
+            </TabControl>
+        </Border>
+        <Border Theme="{StaticResource CardBorder}">
+            <TabControl TabStripPlacement="Bottom">
+                <TabItem Content="Hello 1" Header="Tab 1" />
+                <TabItem Content="Hello 2" Header="Tab 2" />
+                <TabItem Content="Hello 3" Header="Tab 3" />
+                <TabItem Content="中文内容" Header="中文中文" />
+                <TabItem
+                    Content="Hello 4"
+                    Header="Tab 4"
+                    IsEnabled="False" />
+            </TabControl>
+        </Border>
+        <Border Theme="{StaticResource CardBorder}">
+            <TabStrip>
+                <TabStripItem>Tab 1</TabStripItem>
+                <TabStripItem>Tab 2</TabStripItem>
+            </TabStrip>
+        </Border>
+    </StackPanel>
 </UserControl>

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

@@ -1,7 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using Semi.Avalonia.Demo.ViewModels;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -10,6 +9,5 @@ public partial class TabControlDemo : UserControl
     public TabControlDemo()
     {
         InitializeComponent();
-        this.DataContext = new TabControlDemoViewModel();
     }
 }

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

@@ -31,9 +31,9 @@
                     <TextBlock Grid.Row="3" Grid.Column="0">Secondary</TextBlock>
                     <TextBlock Grid.Row="4" Grid.Column="0">Tertiary</TextBlock>
                     <TextBlock Grid.Row="5" Grid.Column="0">Quaternary</TextBlock>
-                    <TextBlock Grid.Row="6" Grid.Column="0">Success</TextBlock>
-                    <TextBlock Grid.Row="7" Grid.Column="0">Warning</TextBlock>
-                    <TextBlock Grid.Row="8" Grid.Column="0">Danger</TextBlock>
+                    <TextBlock Grid.Row="6" Grid.Column="0">Warning</TextBlock>
+                    <TextBlock Grid.Row="7" Grid.Column="0">Danger</TextBlock>
+                    <TextBlock Grid.Row="8" Grid.Column="0">Success</TextBlock>
                     <TextBlock Grid.Row="9" Grid.Column="0">Mark</TextBlock>
                     <TextBlock Grid.Row="10" Grid.Column="0">Underline</TextBlock>
                     <TextBlock Grid.Row="11" Grid.Column="0">Delete</TextBlock>
@@ -60,21 +60,21 @@
                     <TextBlock
                         Grid.Row="6"
                         Grid.Column="1"
-                        Classes="Success">
-                        Success
-                    </TextBlock>
-                    <TextBlock
-                        Grid.Row="7"
-                        Grid.Column="1"
                         Classes="Warning">
                         Warning
                     </TextBlock>
                     <TextBlock
-                        Grid.Row="8"
+                        Grid.Row="7"
                         Grid.Column="1"
                         Classes="Danger">
                         Danger
                     </TextBlock>
+                    <TextBlock
+                        Grid.Row="8"
+                        Grid.Column="1"
+                        Classes="Success">
+                        Success
+                    </TextBlock>
                     <TextBlock
                         Grid.Row="9"
                         Grid.Column="1"

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

@@ -9,7 +9,6 @@
     mc:Ignorable="d">
     <StackPanel Spacing="20">
         <TimePicker />
-        <TimePicker Classes="ClearButton" />
         <TimePicker MinuteIncrement="15" />
         <TimePicker ClockIdentifier="24HourClock" />
         <TimePicker ClockIdentifier="12HourClock" IsEnabled="False" />

demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml

@@ -36,9 +36,9 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Width" Value="1" />
-            <Setter Property="VerticalAlignment" Value="Stretch" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="Border.Width" Value="1" />
+            <Setter Property="Border.VerticalAlignment" Value="Stretch" />
+            <Setter Property="Border.HorizontalAlignment" Value="Left" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

demo/Semi.Avalonia.Demo/ViewModels/DataGridDemoViewModel.cs

@@ -4,7 +4,6 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Avalonia.Collections;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
 
 namespace Semi.Avalonia.Demo.ViewModels;
 
@@ -15,8 +14,6 @@ public class DataGridDemoViewModel: ObservableObject
     public DataGridCollectionView GridData2 { get; set; }
     
     public ObservableCollection<SongViewModel> GridData3 { get; set; }
-    
-    public RelayCommand AddCommand { get; set; }
 
     public DataGridDemoViewModel()
     {
@@ -31,12 +28,6 @@ public class DataGridDemoViewModel: ObservableObject
             CountOfComment = a.CountOfComment,
             IsSelected = false
         }));
-        AddCommand = new RelayCommand(Add);
-    }
-
-    private void Add()
-    {
-        GridData3.Add(new SongViewModel());
     }
 }
 

demo/Semi.Avalonia.Demo/ViewModels/TabControlDemoViewModel.cs

@@ -1,15 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Linq;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace Semi.Avalonia.Demo.ViewModels;
-
-public class TabControlDemoViewModel: ObservableObject
-{
-    public ObservableCollection<string> Items { get; set; }
-
-    public TabControlDemoViewModel()
-    {
-        Items = new ObservableCollection<string>(Enumerable.Range(1, 200).Select(a => "Tab " + a));
-    }
-}

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

@@ -144,9 +144,6 @@
             <TabItem Header="NumericUpDown">
                 <pages:NumericUpDownDemo />
             </TabItem>
-            <TabItem Header="PathIcon">
-                <pages:PathIconDemo/>
-            </TabItem>
             <TabItem Header="ProgressBar">
                 <pages:ProgressBarDemo />
             </TabItem>

demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj

@@ -8,15 +8,14 @@
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     </PropertyGroup>
 
-    <Import Project="../Directory.Build.props" />
-    
+
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia" Version="11.0.0" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
     </ItemGroup>
 

global.json

@@ -1,7 +0,0 @@
-{
-  "sdk": {
-    "version": "7.0.0",
-    "rollForward": "latestMajor",
-    "allowPrerelease": true
-  }
-}

src/Package.props

@@ -3,12 +3,11 @@
         <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <LangVersion>11</LangVersion>
-        <Version>11.0.7.1</Version>
+        <Version>11.0.1</Version>
         <Authors>IRIHI Technology</Authors>
         <Description>Avalonia Theme inspired by Semi Design.</Description>
-        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
         <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
-        <AvaloniaVersion>11.0.7</AvaloniaVersion>
+        <AvaloniaVersion>11.0.0</AvaloniaVersion>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>
 </Project>

src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml

@@ -61,7 +61,7 @@
                         </Panel>
                     </DropDownButton.Content>
                     <DropDownButton.Flyout>
-                        <Flyout FlyoutPresenterClasses="nopadding" Placement="{DynamicResource ColorPickerFlyoutPlacement}">
+                        <Flyout FlyoutPresenterClasses="nopadding" Placement="AnchorAndGravity">
 
                             <!--
                                 The following is copy-pasted from the ColorView's control template.
@@ -238,30 +238,30 @@
                                                 </Style>
                                                 <Style Selector="Grid[Tag=Rgba]">
                                                     <Style Selector="^ NumericUpDown#Component1NumericUpDown">
-                                                        <Setter Property="Tag" Value="R" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="R" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#Component2NumericUpDown">
-                                                        <Setter Property="Tag" Value="G" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="G" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#Component3NumericUpDown">
-                                                        <Setter Property="Tag" Value="B" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="B" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#AlphaComponentNumericUpDown">
-                                                        <Setter Property="Tag" Value="A" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="A" />
                                                     </Style>
                                                 </Style>
                                                 <Style Selector="Grid[Tag=Hsva]">
                                                     <Style Selector="^ NumericUpDown#Component1NumericUpDown">
-                                                        <Setter Property="Tag" Value="H" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="H" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#Component2NumericUpDown">
-                                                        <Setter Property="Tag" Value="S" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="S" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#Component3NumericUpDown">
-                                                        <Setter Property="Tag" Value="V" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="V" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#AlphaComponentNumericUpDown">
-                                                        <Setter Property="Tag" Value="A" />
+                                                        <Setter Property="NumericUpDown.Tag" Value="A" />
                                                     </Style>
                                                 </Style>
                                             </Grid.Styles>

src/Semi.Avalonia.ColorPicker/Controls/ColorView.axaml

@@ -54,7 +54,6 @@
                         AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
                         HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                         IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                        IsDeferredScrollingEnabled="{TemplateBinding (ScrollViewer.IsDeferredScrollingEnabled)}"
                         VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                         <ItemsPresenter
                             Name="PART_ItemsPresenter"
@@ -138,21 +137,21 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:checked">
-            <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonCheckedBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ColorViewRadioButtonCheckedForeground}" />
+            <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonCheckedBackground}" />
+            <Setter Property="RadioButton.Foreground" Value="{DynamicResource ColorViewRadioButtonCheckedForeground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonCheckedPointeroverBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonCheckedPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonCheckedPressedBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonCheckedPressedBackground}" />
             </Style>
         </Style>
         <Style Selector="^:unchecked">
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonPointeroverBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonPressedBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonPressedBackground}" />
             </Style>
         </Style>
     </ControlTheme>
@@ -533,30 +532,30 @@
         </Setter>
         <Style Selector="^[ColorModel=Rgba]">
             <Style Selector="^ /template/ NumericUpDown#Component1NumericUpDown">
-                <Setter Property="Tag" Value="R" />
+                <Setter Property="NumericUpDown.Tag" Value="R" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#Component2NumericUpDown">
-                <Setter Property="Tag" Value="G" />
+                <Setter Property="NumericUpDown.Tag" Value="G" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#Component3NumericUpDown">
-                <Setter Property="Tag" Value="B" />
+                <Setter Property="NumericUpDown.Tag" Value="B" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#AlphaComponentNumericUpDown">
-                <Setter Property="Tag" Value="A" />
+                <Setter Property="NumericUpDown.Tag" Value="A" />
             </Style>
         </Style>
         <Style Selector="^[ColorModel=Hsva]">
             <Style Selector="^ /template/ NumericUpDown#Component1NumericUpDown">
-                <Setter Property="Tag" Value="H" />
+                <Setter Property="NumericUpDown.Tag" Value="H" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#Component2NumericUpDown">
-                <Setter Property="Tag" Value="S" />
+                <Setter Property="NumericUpDown.Tag" Value="S" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#Component3NumericUpDown">
-                <Setter Property="Tag" Value="V" />
+                <Setter Property="NumericUpDown.Tag" Value="V" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#AlphaComponentNumericUpDown">
-                <Setter Property="Tag" Value="A" />
+                <Setter Property="NumericUpDown.Tag" Value="A" />
             </Style>
         </Style>
     </ControlTheme>

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

@@ -4,7 +4,7 @@
 
     <PropertyGroup>
         <Title>Semi.Avalonia.ColorPicker</Title>
-        <PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to 11.0.1</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

src/Semi.Avalonia.ColorPicker/Shared.axaml

@@ -6,15 +6,15 @@
     <Thickness x:Key="ColorViewRadioButtonPadding">16 4</Thickness>
     <x:Double x:Key="ColorViewNumericUpDownWidth">70</x:Double>
 
-    <StreamGeometry x:Key="ColorViewSpectrumIconGlyph">
+    <PathGeometry x:Key="ColorViewSpectrumIconGlyph">
         M6.92,19L5,17.08L13.06,9L15,10.94M20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L13.84,6.41L11.91,4.5L10.5,5.91L11.92,7.33L3,16.25V21H7.75L16.67,12.08L18.09,13.5L19.5,12.09L17.58,10.17L20.7,7.05C21.1,6.65 21.1,6 20.71,5.63Z
-    </StreamGeometry>
-    <StreamGeometry x:Key="ColorViewPaletteIconGlyph">
+    </PathGeometry>
+    <PathGeometry x:Key="ColorViewPaletteIconGlyph">
         M17.5,12A1.5,1.5 0 0,1 16,10.5A1.5,1.5 0 0,1 17.5,9A1.5,1.5 0 0,1 19,10.5A1.5,1.5 0 0,1 17.5,12M14.5,8A1.5,1.5 0 0,1 13,6.5A1.5,1.5 0 0,1 14.5,5A1.5,1.5 0 0,1 16,6.5A1.5,1.5 0 0,1 14.5,8M9.5,8A1.5,1.5 0 0,1 8,6.5A1.5,1.5 0 0,1 9.5,5A1.5,1.5 0 0,1 11,6.5A1.5,1.5 0 0,1 9.5,8M6.5,12A1.5,1.5 0 0,1 5,10.5A1.5,1.5 0 0,1 6.5,9A1.5,1.5 0 0,1 8,10.5A1.5,1.5 0 0,1 6.5,12M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A1.5,1.5 0 0,0 13.5,19.5C13.5,19.11 13.35,18.76 13.11,18.5C12.88,18.23 12.73,17.88 12.73,17.5A1.5,1.5 0 0,1 14.23,16H16A5,5 0 0,0 21,11C21,6.58 16.97,3 12,3Z
-    </StreamGeometry>
-    <StreamGeometry x:Key="ColorViewComponentsIconGlyph">
+    </PathGeometry>
+    <PathGeometry x:Key="ColorViewComponentsIconGlyph">
         M4 6.5C5.10457 6.5 6 5.60457 6 4.5C6 3.39543 5.10457 2.5 4 2.5C2.89543 2.5 2 3.39543 2 4.5C2 5.60457 2.89543 6.5 4 6.5ZM9.5 3C8.67157 3 8 3.67157 8 4.5C8 5.32843 8.67157 6 9.5 6H20.5C21.3284 6 22 5.32843 22 4.5C22 3.67157 21.3284 3 20.5 3H9.5ZM8 11.5C8 10.6716 8.67157 10 9.5 10H20.5C21.3284 10 22 10.6716 22 11.5C22 12.3284 21.3284 13 20.5 13H9.5C8.67157 13 8 12.3284 8 11.5ZM8 18.5C8 17.6716 8.67157 17 9.5 17H20.5C21.3284 17 22 17.6716 22 18.5C22 19.3284 21.3284 20 20.5 20H9.5C8.67157 20 8 19.3284 8 18.5ZM6 11.5C6 12.6046 5.10457 13.5 4 13.5C2.89543 13.5 2 12.6046 2 11.5C2 10.3954 2.89543 9.5 4 9.5C5.10457 9.5 6 10.3954 6 11.5ZM4 20.5C5.10457 20.5 6 19.6046 6 18.5C6 17.3954 5.10457 16.5 4 16.5C2.89543 16.5 2 17.3954 2 18.5C2 19.6046 2.89543 20.5 4 20.5Z
-    </StreamGeometry>
+    </PathGeometry>
 
     <x:Double x:Key="ColorSliderWidth">16</x:Double>
     <CornerRadius x:Key="ColorSliderCornerRadius">6</CornerRadius>
@@ -27,6 +27,4 @@
     <CornerRadius x:Key="ColorPreviewerCornerRadius">3</CornerRadius>
 
     <colorPicker:SemiColorDarkPalette x:Key="SemiColorPalette" />
-    
-    <PlacementMode x:Key="ColorPickerFlyoutPlacement">AnchorAndGravity</PlacementMode>
 </ResourceDictionary>

src/Semi.Avalonia.DataGrid/Dark.axaml

@@ -26,5 +26,5 @@
 
     <SolidColorBrush x:Key="DataGridRowGroupHeaderCurrentBorderBrush" Opacity="0.08" Color="White" />
 
-    <SolidColorBrush x:Key="DataGridDisabledBackground" Color="#E6E8EA" Opacity="0.04" />
+    <SolidColorBrush x:Key="DataGridDisabledBackground" Color="#F9F9F9" />
 </ResourceDictionary>

src/Semi.Avalonia.DataGrid/DataGrid.axaml

@@ -19,7 +19,7 @@
             <Setter Property="MinHeight" Value="20" />
         </Style>
         <Style Selector="^:error:focus /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="Border.BorderBrush" Value="Transparent" />
         </Style>
         <Style Selector="^ /template/ DataValidationErrors">
             <Setter Property="Theme" Value="{DynamicResource TooltipDataValidationErrors}" />
@@ -369,7 +369,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:checked /template/ PathIcon">
-            <Setter Property="RenderTransform" Value="rotate(90deg)" />
+            <Setter Property="PathIcon.RenderTransform" Value="rotate(90deg)" />
         </Style>
     </ControlTheme>
 
@@ -511,13 +511,9 @@
                             Grid.Row="1"
                             Grid.RowSpan="2"
                             Grid.Column="0"
-                            Grid.ColumnSpan="3"
-                            ScrollViewer.IsScrollInertiaEnabled="{TemplateBinding IsScrollInertiaEnabled}">
+                            Grid.ColumnSpan="3">
                             <DataGridRowsPresenter.GestureRecognizers>
-                                <ScrollGestureRecognizer
-                                    CanHorizontallyScroll="True"
-                                    CanVerticallyScroll="True"
-                                    IsScrollInertiaEnabled="{Binding (ScrollViewer.IsScrollInertiaEnabled), ElementName=PART_RowsPresenter}" />
+                                <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
                             </DataGridRowsPresenter.GestureRecognizers>
                         </DataGridRowsPresenter>
                         <Rectangle

src/Semi.Avalonia.DataGrid/Light.axaml

@@ -26,5 +26,5 @@
 
     <SolidColorBrush x:Key="DataGridRowGroupHeaderCurrentBorderBrush" Opacity="0.08" Color="#1C1F23" />
 
-    <SolidColorBrush x:Key="DataGridDisabledBackground" Color="#2E3238" Opacity="0.02" />
+    <SolidColorBrush x:Key="DataGridDisabledBackground" Color="#F9F9F9" />
 </ResourceDictionary>

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

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="../Package.props"/>
-    
+
     <PropertyGroup>
         <Title>Semi.Avalonia.DataGrid</Title>
-        <PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to 11.0.1</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

src/Semi.Avalonia.DataGrid/Shared.axaml

@@ -8,12 +8,12 @@
     <Thickness x:Key="DataGridColumnHeaderPadding">12 0 0 0</Thickness>
     <x:Double x:Key="DataGridColumnHeaderMinHeight">32</x:Double>
 
-    <StreamGeometry x:Key="DataGridColumnHeaderAscendingGlyph">M6.45096 8.34102L11.247 2.86102C11.3408 2.75361 11.4566 2.66753 11.5865 2.60854C11.7163 2.54956 11.8573 2.51904 12 2.51904C12.1426 2.51904 12.2836 2.54956 12.4135 2.60854C12.5433 2.66753 12.6591 2.75361 12.753 2.86102L17.549 8.34102C18.115 8.98802 17.655 10 16.796 10H7.20396C6.34396 10 5.88496 8.98802 6.45096 8.34102Z</StreamGeometry>
-    <StreamGeometry x:Key="DataGridColumnHeaderDescendingGlyph">M17.549 15.659L12.753 21.139C12.6591 21.2464 12.5434 21.3325 12.4135 21.3915C12.2836 21.4505 12.1427 21.481 12 21.481C11.8574 21.481 11.7164 21.4505 11.5865 21.3915C11.4566 21.3325 11.3409 21.2464 11.247 21.139L6.45101 15.659C5.88501 15.011 6.34501 14 7.20401 14H16.796C17.656 14 18.115 15.012 17.549 15.659Z</StreamGeometry>
+    <PathGeometry x:Key="DataGridColumnHeaderAscendingGlyph">M6.45096 8.34102L11.247 2.86102C11.3408 2.75361 11.4566 2.66753 11.5865 2.60854C11.7163 2.54956 11.8573 2.51904 12 2.51904C12.1426 2.51904 12.2836 2.54956 12.4135 2.60854C12.5433 2.66753 12.6591 2.75361 12.753 2.86102L17.549 8.34102C18.115 8.98802 17.655 10 16.796 10H7.20396C6.34396 10 5.88496 8.98802 6.45096 8.34102Z</PathGeometry>
+    <PathGeometry x:Key="DataGridColumnHeaderDescendingGlyph">M17.549 15.659L12.753 21.139C12.6591 21.2464 12.5434 21.3325 12.4135 21.3915C12.2836 21.4505 12.1427 21.481 12 21.481C11.8574 21.481 11.7164 21.4505 11.5865 21.3915C11.4566 21.3325 11.3409 21.2464 11.247 21.139L6.45101 15.659C5.88501 15.011 6.34501 14 7.20401 14H16.796C17.656 14 18.115 15.012 17.549 15.659Z</PathGeometry>
 
     <Thickness x:Key="DataGridRowHeaderMargin">8 0</Thickness>
 
-    <StreamGeometry x:Key="DataGridRowGroupHeaderExpandIconGlyph">M7.43934 19.7957C6.85355 19.2099 6.85355 18.2601 7.43934 17.6744L13.0962 12.0175L7.43934 6.36065C6.85355 5.77486 6.85355 4.82511 7.43934 4.23933C8.02513 3.65354 8.97487 3.65354 9.56066 4.23933L16.2782 10.9568C16.864 11.5426 16.864 12.4924 16.2782 13.0782L9.56066 19.7957C8.97487 20.3815 8.02513 20.3815 7.43934 19.7957Z</StreamGeometry>
+    <PathGeometry x:Key="DataGridRowGroupHeaderExpandIconGlyph">M7.43934 19.7957C6.85355 19.2099 6.85355 18.2601 7.43934 17.6744L13.0962 12.0175L7.43934 6.36065C6.85355 5.77486 6.85355 4.82511 7.43934 4.23933C8.02513 3.65354 8.97487 3.65354 9.56066 4.23933L16.2782 10.9568C16.864 11.5426 16.864 12.4924 16.2782 13.0782L9.56066 19.7957C8.97487 20.3815 8.02513 20.3815 7.43934 19.7957Z</PathGeometry>
 
     <x:Double x:Key="DataGridRowGroupHeaderVisualStrokeThickness">1</x:Double>
 </ResourceDictionary>

src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml

@@ -216,7 +216,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:checked /template/ PathIcon#ChevronPath">
-            <Setter Property="RenderTransform" Value="rotate(90deg)" />
+            <Setter Property="PathIcon.RenderTransform" Value="rotate(90deg)" />
         </Style>
     </ControlTheme>
 

src/Semi.Avalonia/AssemblyInfo.cs

@@ -1,4 +0,0 @@
-using Avalonia.Metadata;
-
-[assembly:XmlnsPrefix("https://irihi.tech/semi", "semi")]
-[assembly:XmlnsDefinition("https://irihi.tech/semi", "Semi.Avalonia")]

src/Semi.Avalonia/Controls/AutoCompleteBox.axaml

@@ -84,10 +84,10 @@
             </Setter>
         </Style>
         <Style Selector="^.Large /template/ TextBox">
-            <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxLargeHeight}" />
+            <Setter Property="TextBox.MinHeight" Value="{DynamicResource AutoCompleteBoxLargeHeight}" />
         </Style>
         <Style Selector="^.Small /template/ TextBox">
-            <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxSmallHeight}" />
+            <Setter Property="TextBox.MinHeight" Value="{DynamicResource AutoCompleteBoxSmallHeight}" />
         </Style>
     </ControlTheme>
 

src/Semi.Avalonia/Controls/Border.axaml

@@ -29,10 +29,10 @@
         <Setter Property="Border.BorderThickness" Value="{DynamicResource ThicknessCardBorderThickness}" />
         <Setter Property="Border.Margin" Value="{DynamicResource ThicknessCardMargin}" />
         <Style Selector="^.Shadow">
-            <Setter Property="BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
+            <Setter Property="Border.BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
         </Style>
         <Style Selector="^.Hover:pointerover">
-            <Setter Property="BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
+            <Setter Property="Border.BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
         </Style>
 
     </ControlTheme>

src/Semi.Avalonia/Controls/Button.axaml

@@ -46,45 +46,45 @@
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
         <Style Selector="^.Large">
-            <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
+            <Setter Property="Button.Padding" Value="{DynamicResource ButtonLargePadding}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
+            <Setter Property="Button.Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
 
@@ -97,97 +97,97 @@
         <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
 
         <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
         </Style>
         <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
+                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
+                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Button.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 
@@ -198,33 +198,10 @@
         <Setter Property="Button.Background" Value="Transparent" />
         <Setter Property="Button.BorderBrush" Value="Transparent" />
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="Button.BorderBrush" Value="Transparent" />
+            <Setter Property="Button.Background" Value="Transparent" />
+            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
     </ControlTheme>
-
-    <ControlTheme x:Key="InnerIconButton" TargetType="Button">
-        <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerForeground}" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="Button">
-                <ContentControl Background="Transparent">
-                    <PathIcon
-                        Width="16"
-                        Height="16"
-                        Margin="{TemplateBinding Padding}"
-                        Data="{TemplateBinding Content}"
-                        Foreground="{TemplateBinding Foreground}" />
-                </ContentControl>
-            </ControlTemplate>
-        </Setter>
-        <Style Selector="^:pointerover">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerPointeroverForeground}" />
-        </Style>
-        <Style Selector="^:pressed">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerPressedForeground}" />
-        </Style>
-    </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/ButtonSpinner.axaml

@@ -34,6 +34,7 @@
 
         <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Background" Value="{DynamicResource ButtonSpinnerRepeatButtonDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSpinnerRepeatButtonDisabledForeground}" />
         </Style>
     </ControlTheme>
 
@@ -97,7 +98,7 @@
         </Setter>
         <Style Selector="^[ButtonSpinnerLocation=Left] /template/ Border#ButtonGroup">
             <Setter Property="Grid.Column" Value="0" />
-            <Setter Property="Margin" Value="0 0 4 0" />
+            <Setter Property="Border.Margin" Value="0 0 4 0" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/Calendar.axaml

@@ -170,18 +170,18 @@
         </Setter>
 
         <Style Selector="^:pointerover /template/ ContentControl">
-            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarButtonPointeroverBackground}" />
+            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarButtonPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed /template/ ContentControl">
-            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarButtonPressedBackground}" />
+            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarButtonPressedBackground}" />
         </Style>
 
         <Style Selector="^:selected">
             <Style Selector="^ /template/ ContentControl">
-                <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarButtonSelectedBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarButtonSelectedForeground}" />
-                <Setter Property="FontWeight" Value="{DynamicResource CalendarItemCalendarButtonSelectedFontWeight}" />
+                <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarButtonSelectedBackground}" />
+                <Setter Property="ContentControl.Foreground" Value="{DynamicResource CalendarItemCalendarButtonSelectedForeground}" />
+                <Setter Property="ContentControl.FontWeight" Value="{DynamicResource CalendarItemCalendarButtonSelectedFontWeight}" />
             </Style>
         </Style>
 
@@ -232,25 +232,25 @@
         </Setter>
 
         <Style Selector="^:pointerover /template/ ContentControl">
-            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarDayButtonPointeroverBackground}" />
+            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarDayButtonPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed /template/ ContentControl">
-            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarDayButtonPressedBackground}" />
+            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarDayButtonPressedBackground}" />
         </Style>
 
         <Style Selector="^:today /template/ ContentControl">
-            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarDayButtonTodayBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonTodayForeground}" />
+            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarDayButtonTodayBackground}" />
+            <Setter Property="ContentControl.Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonTodayForeground}" />
         </Style>
 
         <Style Selector="^:selected /template/ ContentControl">
-            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarDayButtonSelectedBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonSelectedForeground}" />
+            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarDayButtonSelectedBackground}" />
+            <Setter Property="ContentControl.Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonSelectedForeground}" />
         </Style>
 
         <Style Selector="^:inactive /template/ ContentControl">
-            <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonInactiveForeground}" />
+            <Setter Property="ContentControl.Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonInactiveForeground}" />
         </Style>
 
         <Style Selector="^:blackout /template/ ContentControl">

src/Semi.Avalonia/Controls/CalendarDatePicker.axaml

@@ -3,13 +3,33 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <!--  Add Resources Here  -->
+    <ControlTheme x:Key="CalendarDatePickerButton" TargetType="Button">
+        <Setter Property="Button.Foreground" Value="{DynamicResource CalendarDatePickerIconForeground}" />
+        <Setter Property="Button.Template">
+            <ControlTemplate TargetType="Button">
+                <Grid Margin="{TemplateBinding Padding}" Background="Transparent">
+                    <PathIcon
+                        Width="16"
+                        Height="16"
+                        Data="{DynamicResource CalendarDatePickerIconGlyph}"
+                        Foreground="{TemplateBinding Foreground}" />
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:pointerover /template/ PathIcon">
+            <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerIconPointeroverForeground}" />
+        </Style>
+        <Style Selector="^:pressed /template/ PathIcon">
+            <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerIconPointeroverForeground}" />
+        </Style>
+    </ControlTheme>
     <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
         <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}" />
         <Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThickness}" />
         <Setter Property="CornerRadius" Value="{DynamicResource CalendarDatePickerCornerRadius}" />
-        <Setter Property="IsTodayHighlighted" Value="True" />
+        <Setter Property="CalendarDatePicker.IsTodayHighlighted" Value="True" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
@@ -31,11 +51,10 @@
                             <Grid
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
-                                ColumnDefinitions="*, Auto, Auto">
+                                ColumnDefinitions="*,Auto">
                                 <TextBox
                                     Name="PART_TextBox"
                                     Grid.Column="0"
-                                    Grid.ColumnSpan="2"
                                     MinHeight="{DynamicResource CalendarDatePickerDefaultHeight}"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Center"
@@ -72,24 +91,14 @@
                                     </TextBox.Styles>
                                 </TextBox>
                                 <Button
-                                    Name="ClearButton"
+                                    Name="PART_Button"
                                     Grid.Column="1"
                                     Padding="0,0,8,0"
-                                    Content="{DynamicResource IconButtonClearData}"
-                                    Command="{Binding $parent[CalendarDatePicker].Clear}"
+                                    Cursor="Hand"
                                     Focusable="False"
-                                    IsVisible="False"
-                                    Theme="{DynamicResource InnerIconButton}" />
-                                <Button
-                                    Name="PART_Button"
-                                    Grid.Column="2"
-                                    Padding="0,0,8,0"
-                                    Content="{DynamicResource CalendarDatePickerIconGlyph}"
-                                    Focusable="False"
-                                    Theme="{DynamicResource InnerIconButton}" />
+                                    Theme="{DynamicResource CalendarDatePickerButton}" />
                                 <Popup
                                     Name="PART_Popup"
-                                    Grid.Column="0"
                                     HorizontalOffset="-8"
                                     IsLightDismissEnabled="True"
                                     PlacementTarget="{TemplateBinding}"
@@ -108,8 +117,8 @@
                                             DisplayDateStart="{TemplateBinding DisplayDateStart}"
                                             FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
                                             IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
-                                            SelectedDate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedDate, Mode=TwoWay}">
-                                        </Calendar>
+                                            SelectedDate="{TemplateBinding SelectedDate,
+                                                                           Mode=TwoWay}" />
                                     </Border>
                                 </Popup>
                             </Grid>
@@ -120,21 +129,15 @@
 
             </ControlTemplate>
         </Setter>
-        
-        <Style Selector="^.clearButton, ^.ClearButton">
-            <Style Selector="^:pointerover /template/ Button#ClearButton">
-                <Setter Property="IsVisible" Value="{Binding $parent[CalendarDatePicker].SelectedDate, Converter={x:Static ObjectConverters.IsNotNull}}"></Setter>
-            </Style>
-        </Style>
 
         <Style Selector="^.Large">
             <Style Selector="^ /template/ TextBox#PART_TextBox">
-                <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerInnerLargeHeight}" />
+                <Setter Property="TextBox.MinHeight" Value="{DynamicResource CalendarDatePickerInnerLargeHeight}" />
             </Style>
         </Style>
         <Style Selector="^.Small">
             <Style Selector="^ /template/ TextBox#PART_TextBox">
-                <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerInnerSmallHeight}" />
+                <Setter Property="TextBox.MinHeight" Value="{DynamicResource CalendarDatePickerInnerSmallHeight}" />
             </Style>
         </Style>
 
@@ -185,21 +188,21 @@
 
         <Style Selector="^.Bordered">
             <Style Selector="^ Border#Background">
-                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBorderedDefaultBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedDefaultBorderBrush}" />
+                <Setter Property="Border.Background" Value="{DynamicResource CalendarDatePickerBorderedDefaultBackground}" />
+                <Setter Property="Border.BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedDefaultBorderBrush}" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#Background">
-                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBorderBrush}" />
+                <Setter Property="Border.Background" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBackground}" />
+                <Setter Property="Border.BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:focus-within /template/ Border#Background">
-                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBorderBrush}" />
+                <Setter Property="Border.Background" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBackground}" />
+                <Setter Property="Border.BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:disabled">
                 <Style Selector="^ /template/ Border#Background">
                     <Setter Property="Background" Value="{DynamicResource CalendarDatePickerDisabledBackground}" />
-                    <Setter Property="BorderBrush" Value="Transparent" />
+                    <Setter Property="Border.BorderBrush" Value="Transparent" />
                 </Style>
 
                 <Style Selector="^ /template/ Button#PART_Button">
@@ -212,16 +215,16 @@
                     <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsBorderBrush}" />
                 </Style>
                 <Style Selector="^:pointerover /template/ Border#Background">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
+                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
                 </Style>
                 <Style Selector="^:pressed /template/ Border#Background">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPressedBorderBrush}" />
+                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
+                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsPressedBorderBrush}" />
                 </Style>
                 <Style Selector="^:focus-within /template/ Border#Background">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
+                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
                 </Style>
             </Style>
         </Style>

src/Semi.Avalonia/Controls/Carousel.axaml

@@ -34,8 +34,8 @@
                     <Border Padding="4" Background="Transparent">
                         <Ellipse
                             Name="Container"
-                            Width="{DynamicResource CarouselIndicatorWidth}"
-                            Height="{DynamicResource CarouselIndicatorHeight}"
+                            Width="{DynamicResource CarouselIndicatorSelectedHeight}"
+                            Height="{DynamicResource CarouselIndicatorSelectedHeight}"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Fill="{TemplateBinding Foreground}" />
@@ -61,12 +61,18 @@
         <Setter Property="ListBoxItem.Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <Panel Background="Transparent">
-                    <Border Padding="2,0" Background="Transparent">
+                    <Border Padding="4,0" Background="Transparent">
                         <Border
                             Name="Container"
-                            Width="{DynamicResource CarouselIndicatorLineWidth}"
-                            Height="{DynamicResource CarouselIndicatorLineHeight}"
-                            Background="{TemplateBinding Background}">
+                            Width="{DynamicResource CarouselIndicatorSelectedHeight}"
+                            Height="{DynamicResource CarouselIndicatorSelectedHeight}"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="99">
+                            <Border.Transitions>
+                                <Transitions>
+                                    <DoubleTransition Property="Width" Duration="0:0:0.2" />
+                                </Transitions>
+                            </Border.Transitions>
                         </Border>
                     </Border>
                 </Panel>
@@ -80,44 +86,7 @@
         </Style>
         <Style Selector="^:selected /template/ Border#Container">
             <Setter Property="Background" Value="{DynamicResource CarouselIndicatorSelectedForeground}" />
-        </Style>
-    </ControlTheme>
-
-    <ControlTheme x:Key="CarouselIndicatorColumnarListBoxItem" TargetType="ListBoxItem">
-        <Setter Property="ListBoxItem.Cursor" Value="Hand" />
-        <Setter Property="ListBoxItem.Background" Value="{DynamicResource CarouselIndicatorForeground}" />
-        <Setter Property="ListBoxItem.Template">
-            <ControlTemplate TargetType="ListBoxItem">
-                <Panel Background="Transparent">
-                    <Border Padding="2,0" Background="Transparent">
-                        <Border Width="{DynamicResource CarouselIndicatorColumnarWidth}"
-                                Height="{DynamicResource CarouselIndicatorColumnarSelectedHeight}">
-                            <Rectangle
-                                Name="Container"
-                                Width="{DynamicResource CarouselIndicatorColumnarWidth}"
-                                Height="{DynamicResource CarouselIndicatorColumnarHeight}"
-                                VerticalAlignment="Bottom"
-                                Fill="{TemplateBinding Background}">
-                                <Rectangle.Transitions>
-                                    <Transitions>
-                                        <DoubleTransition Property="Height" Duration="0:0:0.2"></DoubleTransition>
-                                    </Transitions>
-                                </Rectangle.Transitions>
-                            </Rectangle>
-                        </Border>
-                    </Border>
-                </Panel>
-            </ControlTemplate>
-        </Setter>
-        <Style Selector="^:pointerover /template/ Rectangle#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorPointeroverForeground}" />
-        </Style>
-        <Style Selector="^:pressed /template/ Rectangle#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorPressedForeground}" />
-        </Style>
-        <Style Selector="^:selected /template/ Rectangle#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorSelectedForeground}" />
-            <Setter Property="Height" Value="{DynamicResource CarouselIndicatorColumnarSelectedHeight}" />
+            <Setter Property="Width" Value="{DynamicResource CarouselIndicatorLineSelectedWidth}" />
         </Style>
     </ControlTheme>
 
@@ -167,7 +136,7 @@
                         Name="PART_ItemsPresenter2"
                         Grid.Row="1"
                         Grid.Column="1"
-                        MaxHeight="30"
+                        MaxHeight="20"
                         Margin="0,8"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
@@ -209,19 +178,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Line /template/ ListBox#PART_ItemsPresenter2">
-            <Setter Property="ItemContainerTheme" Value="{DynamicResource CarouselIndicatorLineListBoxItem}" />
-        </Style>
-        <Style Selector="^.Columnar /template/ ListBox#PART_ItemsPresenter2">
-            <Setter Property="ItemContainerTheme" Value="{DynamicResource CarouselIndicatorColumnarListBoxItem}" />
-        </Style>
-        <Style Selector="^.Left /template/ ListBox#PART_ItemsPresenter2">
-            <Setter Property="HorizontalAlignment" Value="Left" />
-        </Style>
-        <Style Selector="^.Center /template/ ListBox#PART_ItemsPresenter2">
-            <Setter Property="HorizontalAlignment" Value="Center" />
-        </Style>
-        <Style Selector="^.Right /template/ ListBox#PART_ItemsPresenter2">
-            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="ListBox.ItemContainerTheme" Value="{DynamicResource CarouselIndicatorLineListBoxItem}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/ComboBox.axaml

@@ -33,7 +33,6 @@
         <Setter Property="MaxDropDownHeight" Value="504" />
         <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
@@ -44,11 +43,11 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="ComboBox">
                 <DataValidationErrors>
-                    <Grid ColumnDefinitions="*, Auto, 32">
+                    <Grid ColumnDefinitions="*,32">
                         <Border
                             x:Name="Background"
                             Grid.Column="0"
-                            Grid.ColumnSpan="3"
+                            Grid.ColumnSpan="2"
                             MinWidth="{DynamicResource ComboBoxThemeMinWidth}"
                             MinHeight="{DynamicResource ComboBoxDefaultHeight}"
                             Background="{TemplateBinding Background}"
@@ -74,16 +73,10 @@
                             VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                             Content="{TemplateBinding SelectionBoxItem}"
                             ContentTemplate="{TemplateBinding ItemTemplate}" />
-                        <Button
-                            Name="ClearButton"
-                            Grid.Column="1"
-                            Command="{Binding $parent[ComboBox].Clear}"
-                            Content="{DynamicResource IconButtonClearData}"
-                            IsVisible="False"
-                            Theme="{DynamicResource InnerIconButton}" />
+
                         <Border
                             x:Name="DropDownOverlay"
-                            Grid.Column="2"
+                            Grid.Column="1"
                             Width="30"
                             Margin="0,1,1,1"
                             HorizontalAlignment="Right"
@@ -92,7 +85,7 @@
 
                         <PathIcon
                             x:Name="DropDownGlyph"
-                            Grid.Column="2"
+                            Grid.Column="1"
                             Width="12"
                             Height="12"
                             Margin="0,0,10,0"
@@ -125,10 +118,7 @@
                                 BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
                                 ClipToBounds="True"
                                 CornerRadius="6">
-                                <ScrollViewer
-                                    HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                    IsDeferredScrollingEnabled="{TemplateBinding (ScrollViewer.IsDeferredScrollingEnabled)}"
-                                    VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                                <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                                     <ItemsPresenter
                                         Name="PART_ItemsPresenter"
                                         Margin="{DynamicResource ComboBoxDropdownContentMargin}"
@@ -141,17 +131,11 @@
             </ControlTemplate>
         </Setter>
 
-        <Style Selector="^.clearButton, ^.ClearButton">
-            <Style Selector="^:pointerover /template/ Button#ClearButton">
-                <Setter Property="IsVisible" Value="{Binding $parent[ComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNotNull}}" />
-            </Style>
-        </Style>
-
         <Style Selector="^.Large /template/ Border#Background">
-            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
+            <Setter Property="ComboBox.MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
         </Style>
         <Style Selector="^.Small /template/ Border#Background">
-            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
+            <Setter Property="ComboBox.MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
         </Style>
 
         <!--  Pointerover State  -->
@@ -223,8 +207,8 @@
             </Style>
             <Style Selector="^:disabled">
                 <Style Selector="^ /template/ Border#Background">
-                    <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
+                    <Setter Property="Border.Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
+                    <Setter Property="Border.BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
                 </Style>
                 <Style Selector="^ /template/ ContentControl#ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource ComboBoxDisabledForeground}" />

src/Semi.Avalonia/Controls/DatePicker.axaml

@@ -135,17 +135,11 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="DatePicker">
                 <DataValidationErrors>
-                    <Grid
-                        Name="LayoutRoot"
-                        Margin="{TemplateBinding Padding}"
-                        ColumnDefinitions="*, Auto">
+                    <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}">
                         <Button
                             Name="PART_FlyoutButton"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
                             Width="298"
                             MinWidth="298"
-                            MinHeight="{DynamicResource DateTimePickerButtonDefaultHeight}"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             Background="{TemplateBinding Background}"
@@ -156,6 +150,7 @@
                             DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                             Foreground="{TemplateBinding Foreground}"
                             IsEnabled="{TemplateBinding IsEnabled}"
+                            MinHeight="{DynamicResource DateTimePickerButtonDefaultHeight}"
                             Theme="{StaticResource DateTimePickerFlyoutButton}">
                             <Grid ColumnDefinitions="*, Auto">
                                 <Grid
@@ -215,38 +210,21 @@
                                     Foreground="{DynamicResource DateTimePickerIconForeground}" />
                             </Grid>
                         </Button>
+
                         <Popup
                             Name="PART_Popup"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
                             IsLightDismissEnabled="True"
                             Placement="Bottom"
                             PlacementTarget="{TemplateBinding}"
                             WindowManagerAddShadowHint="False">
                             <DatePickerPresenter Name="PART_PickerPresenter" />
                         </Popup>
-                        <Button
-                            Name="ClearButton"
-                            Grid.Column="1"
-                            Margin="0,0,8,0"
-                            Command="{Binding $parent[DatePicker].Clear}"
-                            Content="{DynamicResource IconButtonClearData}"
-                            IsVisible="False"
-                            Theme="{DynamicResource InnerIconButton}" />
+
                     </Grid>
                 </DataValidationErrors>
             </ControlTemplate>
         </Setter>
 
-        <Style Selector="^.clearButton:pointerover, ^.ClearButton:pointerover">
-            <Style Selector="^:not(:hasnodate) /template/ Button#ClearButton">
-                <Setter Property="IsVisible" Value="True" />
-            </Style>
-            <Style Selector="^:not(:hasnodate) /template/ PathIcon#PART_Icon">
-                <Setter Property="Opacity" Value="0" />
-            </Style>
-        </Style>
-
         <Style Selector="^:disabled /template/ PathIcon#PART_Icon">
             <Setter Property="Foreground" Value="{DynamicResource DateTimePickerButtonDisabledIconForeground}" />
         </Style>

src/Semi.Avalonia/Controls/DropDownButton.axaml

@@ -58,45 +58,45 @@
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
         <Style Selector="^.Large">
-            <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
+            <Setter Property="DropDownButton.Padding" Value="{DynamicResource ButtonLargePadding}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
+            <Setter Property="DropDownButton.Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
 
@@ -155,88 +155,88 @@
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
+                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
+                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 
@@ -247,9 +247,9 @@
         <Setter Property="DropDownButton.Background" Value="Transparent" />
         <Setter Property="DropDownButton.BorderBrush" Value="Transparent" />
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="DropDownButton.BorderBrush" Value="Transparent" />
+            <Setter Property="DropDownButton.Background" Value="Transparent" />
+            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/Expander.axaml

@@ -86,29 +86,29 @@
         </Setter>
 
         <Style Selector="^:expanded /template/ PathIcon#PART_PathIcon">
-            <Setter Property="RenderTransform" Value="rotate(180deg)" />
+            <Setter Property="PathIcon.RenderTransform" Value="rotate(180deg)" />
         </Style>
 
         <Style Selector="^:right">
             <Style Selector="^ /template/ LayoutTransformControl#ExpanderHeaderLayoutContainer">
-                <Setter Property="LayoutTransform">
+                <Setter Property="LayoutTransformControl.LayoutTransform">
                     <RotateTransform Angle="-90" />
                 </Setter>
                 <Setter Property="VerticalAlignment" Value="Stretch" />
             </Style>
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="Expander.HorizontalAlignment" Value="Left" />
+            <Setter Property="Expander.VerticalAlignment" Value="Stretch" />
         </Style>
 
         <Style Selector="^:left">
             <Style Selector="^ /template/ LayoutTransformControl#ExpanderHeaderLayoutContainer">
-                <Setter Property="LayoutTransform">
+                <Setter Property="LayoutTransformControl.LayoutTransform">
                     <RotateTransform Angle="90" />
                 </Setter>
                 <Setter Property="VerticalAlignment" Value="Stretch" />
             </Style>
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="Expander.HorizontalAlignment" Value="Stretch" />
+            <Setter Property="Expander.VerticalAlignment" Value="Stretch" />
         </Style>
 
         <Style Selector="^:left /template/ LayoutTransformControl#ExpanderHeaderLayoutContainer">
@@ -125,30 +125,30 @@
         </Style>
 
         <Style Selector="^:left /template/ Border#ExpanderContent">
-            <Setter Property="MinWidth" Value="2" />
-            <Setter Property="BorderThickness" Value="{DynamicResource ExpanderLeftContentBorderThickness}" />
+            <Setter Property="Border.MinWidth" Value="2" />
+            <Setter Property="Border.BorderThickness" Value="{DynamicResource ExpanderLeftContentBorderThickness}" />
         </Style>
         <Style Selector="^:up /template/ Border#ExpanderContent">
-            <Setter Property="MinHeight" Value="2" />
-            <Setter Property="BorderThickness" Value="{DynamicResource ExpanderUpContentBorderThickness}" />
+            <Setter Property="Border.MinHeight" Value="2" />
+            <Setter Property="Border.BorderThickness" Value="{DynamicResource ExpanderUpContentBorderThickness}" />
         </Style>
         <Style Selector="^:right /template/ Border#ExpanderContent">
-            <Setter Property="MinWidth" Value="2" />
-            <Setter Property="BorderThickness" Value="{DynamicResource ExpanderRightContentBorderThickness}" />
+            <Setter Property="Border.MinWidth" Value="2" />
+            <Setter Property="Border.BorderThickness" Value="{DynamicResource ExpanderRightContentBorderThickness}" />
         </Style>
         <Style Selector="^:down /template/ Border#ExpanderContent">
-            <Setter Property="MinHeight" Value="2" />
-            <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDownContentBorderThickness}" />
+            <Setter Property="Border.MinHeight" Value="2" />
+            <Setter Property="Border.BorderThickness" Value="{DynamicResource ExpanderDownContentBorderThickness}" />
         </Style>
 
         <Style Selector="^ /template/ ToggleButton#ExpanderHeader:pointerover">
-            <Setter Property="Background" Value="{DynamicResource ExpanderHeaderHoverBackground}" />
+            <Setter Property="ToggleButton.Background" Value="{DynamicResource ExpanderHeaderHoverBackground}" />
         </Style>
         <Style Selector="^ /template/ ToggleButton#ExpanderHeader:pressed">
-            <Setter Property="Background" Value="{DynamicResource ExpanderHeaderPressedBackground}" />
+            <Setter Property="ToggleButton.Background" Value="{DynamicResource ExpanderHeaderPressedBackground}" />
         </Style>
         <Style Selector="^ /template/ ToggleButton#ExpanderHeader:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
+            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/HeaderedContentControl.axaml

@@ -2,47 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <ControlTheme x:Key="{x:Type HeaderedContentControl}" TargetType="HeaderedContentControl">
-        <Setter Property="Padding" Value="3" />
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    Background="{TemplateBinding Background}"
-                    Padding="{TemplateBinding Padding}">
-                    <Grid RowDefinitions="auto *">
-                        <ContentPresenter
-                            Name="PART_HeaderPresenter"
-                            Content="{TemplateBinding Header}"
-                            RecognizesAccessKey="True"
-                            ContentTemplate="{TemplateBinding HeaderTemplate}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            FontSize="{TemplateBinding FontSize}"
-                            FontWeight="{TemplateBinding FontWeight}"
-                            FontFamily="{TemplateBinding FontFamily}"
-                            FontStyle="{TemplateBinding FontStyle}"
-                            Grid.Row="0" />
-                        <ContentPresenter
-                            Name="PART_ContentPresenter"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            RecognizesAccessKey="True"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            FontSize="{TemplateBinding FontSize}"
-                            FontWeight="{TemplateBinding FontWeight}"
-                            FontFamily="{TemplateBinding FontFamily}"
-                            FontStyle="{TemplateBinding FontStyle}"
-                            Grid.Row="1" />
-                    </Grid>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </ControlTheme>
-
     <ControlTheme x:Key="GroupBox" TargetType="HeaderedContentControl">
         <Setter Property="Background" Value="{DynamicResource HeaderedContentControlDefaultBackground}" />
         <Setter Property="BorderThickness" Value="1" />

src/Semi.Avalonia/Controls/Label.axaml

@@ -100,38 +100,38 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
         </Style>
         <Style Selector="^.Quaternary">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
-        </Style>
-        <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
+        </Style>
+        <Style Selector="^.Success">
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
         </Style>
         <Style Selector="^.Mark">
-            <Setter Property="Background" Value="{DynamicResource TextBlockMarkBackground}" />
+            <Setter Property="Label.Background" Value="{DynamicResource TextBlockMarkBackground}" />
         </Style>
         <Style Selector="^.Code">
-            <Setter Property="Background" Value="{DynamicResource TextBlockCodeBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockCodeForeground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource TextBlockCodeBorderBrush}" />
-            <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="Padding" Value="2" />
-            <Setter Property="CornerRadius" Value="{DynamicResource TextBlockCodeCornerRadius}" />
-            <Setter Property="FontFamily" Value="{DynamicResource CodeFontFamily}" />
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockCodeFontSize}" />
+            <Setter Property="Label.Background" Value="{DynamicResource TextBlockCodeBackground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockCodeForeground}" />
+            <Setter Property="Label.BorderBrush" Value="{DynamicResource TextBlockCodeBorderBrush}" />
+            <Setter Property="Label.BorderThickness" Value="1" />
+            <Setter Property="Label.Padding" Value="2" />
+            <Setter Property="Label.CornerRadius" Value="{DynamicResource TextBlockCodeCornerRadius}" />
+            <Setter Property="Label.FontFamily" Value="{DynamicResource CodeFontFamily}" />
+            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockCodeFontSize}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
         </Style>
     </ControlTheme>
     <ControlTheme
@@ -140,22 +140,22 @@
         TargetType="Label">
         <Setter Property="Label.FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
         <Style Selector="^.H1">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
+            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
         </Style>
         <Style Selector="^.H2">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH2FontSize}" />
+            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH2FontSize}" />
         </Style>
         <Style Selector="^.H3">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH3FontSize}" />
+            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH3FontSize}" />
         </Style>
         <Style Selector="^.H4">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH4FontSize}" />
+            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH4FontSize}" />
         </Style>
         <Style Selector="^.H5">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH5FontSize}" />
+            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH5FontSize}" />
         </Style>
         <Style Selector="^.H6">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
+            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
         </Style>
     </ControlTheme>
 
@@ -193,216 +193,216 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Large">
-            <Setter Property="Padding" Value="{DynamicResource LabelTagLargePadding}" />
-            <Setter Property="MinHeight" Value="{DynamicResource LabelTagLargeHeight}" />
+            <Setter Property="Label.Padding" Value="{DynamicResource LabelTagLargePadding}" />
+            <Setter Property="Label.MinHeight" Value="{DynamicResource LabelTagLargeHeight}" />
         </Style>
         <Style Selector="^.Circle">
-            <Setter Property="CornerRadius" Value="{DynamicResource LabelTagCircleCornerRadius}" />
+            <Setter Property="Label.CornerRadius" Value="{DynamicResource LabelTagCircleCornerRadius}" />
         </Style>
         <Style Selector="^">
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
+            <Setter Property="Label.BorderBrush" Value="Transparent" />
+            <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
             <Style Selector="^.Red">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightRedBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightRedForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightRedBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightRedForeground}" />
             </Style>
             <Style Selector="^.Pink">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightPinkBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightPinkForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightPinkBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightPinkForeground}" />
             </Style>
             <Style Selector="^.Purple">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightPurpleBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightPurpleForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightPurpleBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightPurpleForeground}" />
             </Style>
             <Style Selector="^.Violet">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightVioletBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightVioletForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightVioletBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightVioletForeground}" />
             </Style>
             <Style Selector="^.Indigo">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightIndigoBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightIndigoForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightIndigoBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightIndigoForeground}" />
             </Style>
             <Style Selector="^.Blue">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightBlueBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightBlueForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightBlueBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightBlueForeground}" />
             </Style>
             <Style Selector="^.LightBlue">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightLightBlueBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightLightBlueForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLightBlueBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLightBlueForeground}" />
             </Style>
             <Style Selector="^.Cyan">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightCyanBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightCyanForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightCyanBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightCyanForeground}" />
             </Style>
             <Style Selector="^.Teal">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightTealBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightTealForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightTealBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightTealForeground}" />
             </Style>
             <Style Selector="^.Green">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightGreenBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreenForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightGreenBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreenForeground}" />
             </Style>
             <Style Selector="^.LightGreen">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightLightGreenBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightLightGreenForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLightGreenBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLightGreenForeground}" />
             </Style>
             <Style Selector="^.Lime">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightLimeBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightLimeForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLimeBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLimeForeground}" />
             </Style>
             <Style Selector="^.Yellow">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightYellowBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightYellowForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightYellowBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightYellowForeground}" />
             </Style>
             <Style Selector="^.Amber">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightAmberBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightAmberForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightAmberBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightAmberForeground}" />
             </Style>
             <Style Selector="^.Orange">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightOrangeBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightOrangeForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightOrangeBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightOrangeForeground}" />
             </Style>
             <Style Selector="^.Grey">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
             </Style>
             <Style Selector="^.White">
-                <Setter Property="Background" Value="{DynamicResource LabelTagLightWhiteBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightWhiteForeground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagLightWhiteBorderBrush}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightWhiteBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightWhiteForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagLightWhiteBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Ghost">
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="BorderBrush" Value="{DynamicResource LabelTagLightGreyBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
+            <Setter Property="Label.Background" Value="Transparent" />
+            <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagLightGreyBackground}" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
             <Style Selector="^.Red">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostRedBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostRedForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostRedBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostRedForeground}" />
             </Style>
             <Style Selector="^.Pink">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostPinkBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostPinkForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostPinkBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostPinkForeground}" />
             </Style>
             <Style Selector="^.Purple">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostPurpleBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostPurpleForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostPurpleBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostPurpleForeground}" />
             </Style>
             <Style Selector="^.Violet">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostVioletBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostVioletForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostVioletBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostVioletForeground}" />
             </Style>
             <Style Selector="^.Indigo">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostIndigoBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostIndigoForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostIndigoBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostIndigoForeground}" />
             </Style>
             <Style Selector="^.Blue">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostBlueBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostBlueForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostBlueBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostBlueForeground}" />
             </Style>
             <Style Selector="^.LightBlue">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostLightBlueBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostLightBlueForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLightBlueBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLightBlueForeground}" />
             </Style>
             <Style Selector="^.Cyan">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostCyanBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostCyanForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostCyanBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostCyanForeground}" />
             </Style>
             <Style Selector="^.Teal">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostTealBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostTealForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostTealBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostTealForeground}" />
             </Style>
             <Style Selector="^.Green">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostGreenBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostGreenForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostGreenBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostGreenForeground}" />
             </Style>
             <Style Selector="^.LightGreen">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostLightGreenBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostLightGreenForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLightGreenBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLightGreenForeground}" />
             </Style>
             <Style Selector="^.Lime">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostLimeBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostLimeForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLimeBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLimeForeground}" />
             </Style>
             <Style Selector="^.Yellow">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostYellowBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostYellowForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostYellowBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostYellowForeground}" />
             </Style>
             <Style Selector="^.Amber">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostAmberBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostAmberForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostAmberBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostAmberForeground}" />
             </Style>
             <Style Selector="^.Orange">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostOrangeBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostOrangeForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostOrangeBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostOrangeForeground}" />
             </Style>
             <Style Selector="^.Grey">
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostGreyBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostGreyForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostGreyBorderBrush}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostGreyForeground}" />
             </Style>
             <Style Selector="^.White">
-                <Setter Property="Background" Value="{DynamicResource LabelTagGhostWhiteBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostWhiteForeground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostWhiteBorderBrush}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagGhostWhiteBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostWhiteForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostWhiteBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Solid">
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="Foreground" Value="{DynamicResource LabelTagSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
+            <Setter Property="Label.BorderBrush" Value="Transparent" />
+            <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagSolidForeground}" />
+            <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
             <Style Selector="^.Red">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidRedBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidRedBackground}" />
             </Style>
             <Style Selector="^.Pink">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidPinkBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidPinkBackground}" />
             </Style>
             <Style Selector="^.Purple">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidPurpleBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidPurpleBackground}" />
             </Style>
             <Style Selector="^.Violet">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidVioletBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidVioletBackground}" />
             </Style>
             <Style Selector="^.Indigo">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidIndigoBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidIndigoBackground}" />
             </Style>
             <Style Selector="^.Blue">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidBlueBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidBlueBackground}" />
             </Style>
             <Style Selector="^.LightBlue">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidLightBlueBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLightBlueBackground}" />
             </Style>
             <Style Selector="^.Cyan">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidCyanBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidCyanBackground}" />
             </Style>
             <Style Selector="^.Teal">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidTealBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidTealBackground}" />
             </Style>
             <Style Selector="^.Green">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidGreenBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidGreenBackground}" />
             </Style>
             <Style Selector="^.LightGreen">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidLightGreenBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLightGreenBackground}" />
             </Style>
             <Style Selector="^.Lime">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidLimeBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLimeBackground}" />
             </Style>
             <Style Selector="^.Yellow">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidYellowBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidYellowBackground}" />
             </Style>
             <Style Selector="^.Amber">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidAmberBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidAmberBackground}" />
             </Style>
             <Style Selector="^.Orange">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidOrangeBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidOrangeBackground}" />
             </Style>
             <Style Selector="^.Grey">
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
             </Style>
             <Style Selector="^.White">
-                <Setter Property="Foreground" Value="{DynamicResource LabelTagSolidWhiteForeground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagSolidWhiteBorderBrush}" />
-                <Setter Property="Background" Value="{DynamicResource LabelTagSolidWhiteBackground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagSolidWhiteForeground}" />
+                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagSolidWhiteBorderBrush}" />
+                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidWhiteBackground}" />
             </Style>
         </Style>
     </ControlTheme>

src/Semi.Avalonia/Controls/ListBox.axaml

@@ -30,8 +30,6 @@
                         AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
                         HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                         IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                        IsDeferredScrollingEnabled="{TemplateBinding (ScrollViewer.IsDeferredScrollingEnabled)}"
-                        IsScrollInertiaEnabled="{TemplateBinding (ScrollViewer.IsScrollInertiaEnabled)}"
                         VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                         <ItemsPresenter
                             Name="PART_ItemsPresenter"
@@ -65,29 +63,29 @@
         </Setter>
 
         <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemDisabledForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ListBoxItemDisabledBackground}" />
+            <Setter Property="ListBoxItem.Foreground" Value="{DynamicResource ListBoxItemDisabledForeground}" />
+            <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemDisabledBackground}" />
             <Style Selector="^:selected">
-                <Setter Property="Background"
+                <Setter Property="ListBoxItem.Background"
                         Value="{DynamicResource ListBoxItemSelectedDisabledBackground}" />
             </Style>
         </Style>
 
         <!--  Pointerover State  -->
         <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
+            <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
         </Style>
 
         <!--  Pressed State  -->
         <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource ListBoxItemPressedBackground}" />
+            <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemPressedBackground}" />
         </Style>
 
         <!--  Selected State  -->
         <Style Selector="^:selected">
-            <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedBackground}" />
+            <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemSelectedBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background"
+                <Setter Property="ListBoxItem.Background"
                         Value="{DynamicResource ListBoxItemSelectedPointeroverBackground}" />
             </Style>
         </Style>
@@ -184,7 +182,7 @@
             <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconDefaultBackground}" />
         </Style>
         <Style Selector="^ /template/ Ellipse#CheckGlyph">
-            <Setter Property="Opacity" Value="0" />
+            <Setter Property="Ellipse.Opacity" Value="0" />
         </Style>
 
         <!--  Unchecked Pointerover State  -->
@@ -195,7 +193,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconPointeroverBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
         </Style>
 
@@ -206,7 +204,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconPressedBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
         </Style>
 
@@ -217,7 +215,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconDisabledBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Foreground" Value="{DynamicResource ListBoxItemRadioGroupDisabledForeground}" />
@@ -231,7 +229,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="1" />
+                <Setter Property="Ellipse.Opacity" Value="1" />
             </Style>
 
             <!--  Checked Pointerover State  -->
@@ -243,7 +241,7 @@
                             Value="{DynamicResource ListBoxItemRadioGroupCheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -255,7 +253,7 @@
                     <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -267,7 +265,7 @@
                     <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource ListBoxItemRadioGroupDisabledForeground}" />
@@ -314,30 +312,30 @@
         </Setter>
         <Setter Property="ListBoxItem.Background" Value="Transparent" />
         <Style Selector="^:pointerover">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupButtonUncheckedPointeroverBackground}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Foreground"
+            <Setter Property="ListBoxItem.Foreground"
                     Value="{DynamicResource ListBoxItemRadioGroupButtonUncheckedDisabledForeground}" />
         </Style>
         <Style Selector="^:selected">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupButtonCheckedBackground}" />
-            <Setter Property="Foreground"
+            <Setter Property="ListBoxItem.Foreground"
                     Value="{DynamicResource ListBoxItemRadioGroupButtonCheckedForeground}" />
             <Style Selector="^:disabled">
-                <Setter Property="Foreground"
+                <Setter Property="ListBoxItem.Foreground"
                         Value="{DynamicResource ListBoxItemRadioGroupButtonCheckedDisabledForeground}" />
             </Style>
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="FontSize" Value="{DynamicResource ListBoxItemRadioGroupButtonSmallFontSize}" />
-            <Setter Property="Padding" Value="{DynamicResource ListBoxItemRadioGroupButtonSmallPadding}" />
+            <Setter Property="ListBoxItem.FontSize" Value="{DynamicResource ListBoxItemRadioGroupButtonSmallFontSize}" />
+            <Setter Property="ListBoxItem.Padding" Value="{DynamicResource ListBoxItemRadioGroupButtonSmallPadding}" />
         </Style>
         <Style Selector="^.Large">
-            <Setter Property="FontSize" Value="{DynamicResource ListBoxItemRadioGroupButtonLargeFontSize}" />
-            <Setter Property="Padding" Value="{DynamicResource ListBoxItemRadioGroupButtonLargePadding}" />
+            <Setter Property="ListBoxItem.FontSize" Value="{DynamicResource ListBoxItemRadioGroupButtonLargeFontSize}" />
+            <Setter Property="ListBoxItem.Padding" Value="{DynamicResource ListBoxItemRadioGroupButtonLargePadding}" />
         </Style>
     </ControlTheme>
 
@@ -414,31 +412,31 @@
             <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconDefaultBackground}" />
         </Style>
         <Style Selector="^ /template/ Ellipse#CheckGlyph">
-            <Setter Property="Opacity" Value="0" />
+            <Setter Property="Ellipse.Opacity" Value="0" />
         </Style>
 
         <!--  Unchecked Pointerover State  -->
         <Style Selector="^:pointerover">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardUncheckPointeroverBackground}" />
             <Style Selector="^ /template/ Ellipse#OuterEllipse">
                 <Setter Property="Stroke"
                         Value="{DynamicResource ListBoxItemRadioGroupUncheckIconPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
         </Style>
 
         <!--  Unchecked Pressed State  -->
         <Style Selector="^:pressed">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardUncheckPressedBackground}" />
             <Style Selector="^ /template/ Ellipse#OuterEllipse">
                 <Setter Property="Stroke" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconPressedBorderBrush}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
         </Style>
 
@@ -449,7 +447,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconDisabledBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Foreground" Value="{DynamicResource ListBoxItemRadioGroupDisabledForeground}" />
@@ -458,21 +456,21 @@
 
         <!--  Checked State  -->
         <Style Selector="^:selected">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardCheckedBackground}" />
-            <Setter Property="BorderBrush"
+            <Setter Property="ListBoxItem.BorderBrush"
                     Value="{DynamicResource ListBoxItemRadioGroupCardCheckDefaultBorderBrush}" />
             <Style Selector="^ /template/ Ellipse#OuterEllipse">
                 <Setter Property="Stroke" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDefaultBorderBrush}" />
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="1" />
+                <Setter Property="Ellipse.Opacity" Value="1" />
             </Style>
 
             <!--  Checked Pointerover State  -->
             <Style Selector="^:pointerover">
-                <Setter Property="BorderBrush"
+                <Setter Property="ListBoxItem.BorderBrush"
                         Value="{DynamicResource ListBoxItemRadioGroupCardCheckPointeroverBorderBrush}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke"
@@ -487,13 +485,13 @@
                             Value="{DynamicResource ListBoxItemRadioGroupCheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
             <!--  Checked Pressed State  -->
             <Style Selector="^:pressed">
-                <Setter Property="BorderBrush"
+                <Setter Property="ListBoxItem.BorderBrush"
                         Value="{DynamicResource ListBoxItemRadioGroupCardCheckPressedBorderBrush}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke"
@@ -501,7 +499,7 @@
                     <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -513,7 +511,7 @@
                     <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
                 <Style Selector="^ /template/ Border#RootBorder">
                     <Setter Property="BorderBrush"
@@ -562,11 +560,11 @@
         <Setter Property="ListBoxItem.BorderBrush"
                 Value="{DynamicResource ListBoxItemRadioGroupCardDefaultBorderBrush}" />
         <Style Selector="^:pointerover">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardUncheckPointeroverBackground}" />
         </Style>
         <Style Selector="^:pressed">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardUncheckPressedBackground}" />
         </Style>
         <Style Selector="^:disabled">
@@ -575,16 +573,16 @@
             </Style>
         </Style>
         <Style Selector="^:selected">
-            <Setter Property="Background"
+            <Setter Property="ListBoxItem.Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardCheckedBackground}" />
-            <Setter Property="BorderBrush"
+            <Setter Property="ListBoxItem.BorderBrush"
                     Value="{DynamicResource ListBoxItemRadioGroupCardCheckDefaultBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="BorderBrush"
+                <Setter Property="ListBoxItem.BorderBrush"
                         Value="{DynamicResource ListBoxItemRadioGroupCardCheckPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="BorderBrush"
+                <Setter Property="ListBoxItem.BorderBrush"
                         Value="{DynamicResource ListBoxItemRadioGroupCardCheckPressedBorderBrush}" />
             </Style>
             <Style Selector="^:disabled">

src/Semi.Avalonia/Controls/ManagedFileChooser.axaml

@@ -16,9 +16,9 @@
     </Design.PreviewWith>
 
     <converters:KeyToPathConverter x:Key="Icons">
-        <StreamGeometry x:Key="Icon_Folder">M19,20H4C2.89,20 2,19.1 2,18V6C2,4.89 2.89,4 4,4H10L12,6H19A2,2 0 0,1 21,8H21L4,8V18L6.14,10H23.21L20.93,18.5C20.7,19.37 19.92,20 19,20Z</StreamGeometry>
-        <StreamGeometry x:Key="Icon_File">M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M15,18V16H6V18H15M18,14V12H6V14H18Z</StreamGeometry>
-        <StreamGeometry x:Key="Icon_Volume">M6,2H18A2,2 0 0,1 20,4V20A2,2 0 0,1 18,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2M12,4A6,6 0 0,0 6,10C6,13.31 8.69,16 12.1,16L11.22,13.77C10.95,13.29 11.11,12.68 11.59,12.4L12.45,11.9C12.93,11.63 13.54,11.79 13.82,12.27L15.74,14.69C17.12,13.59 18,11.9 18,10A6,6 0 0,0 12,4M12,9A1,1 0 0,1 13,10A1,1 0 0,1 12,11A1,1 0 0,1 11,10A1,1 0 0,1 12,9M7,18A1,1 0 0,0 6,19A1,1 0 0,0 7,20A1,1 0 0,0 8,19A1,1 0 0,0 7,18M12.09,13.27L14.58,19.58L17.17,18.08L12.95,12.77L12.09,13.27Z</StreamGeometry>
+        <PathGeometry x:Key="Icon_Folder">M19,20H4C2.89,20 2,19.1 2,18V6C2,4.89 2.89,4 4,4H10L12,6H19A2,2 0 0,1 21,8H21L4,8V18L6.14,10H23.21L20.93,18.5C20.7,19.37 19.92,20 19,20Z</PathGeometry>
+        <PathGeometry x:Key="Icon_File">M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M15,18V16H6V18H15M18,14V12H6V14H18Z</PathGeometry>
+        <PathGeometry x:Key="Icon_Volume">M6,2H18A2,2 0 0,1 20,4V20A2,2 0 0,1 18,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2M12,4A6,6 0 0,0 6,10C6,13.31 8.69,16 12.1,16L11.22,13.77C10.95,13.29 11.11,12.68 11.59,12.4L12.45,11.9C12.93,11.63 13.54,11.79 13.82,12.27L15.74,14.69C17.12,13.59 18,11.9 18,10A6,6 0 0,0 12,4M12,9A1,1 0 0,1 13,10A1,1 0 0,1 12,11A1,1 0 0,1 11,10A1,1 0 0,1 12,9M7,18A1,1 0 0,0 6,19A1,1 0 0,0 7,20A1,1 0 0,0 8,19A1,1 0 0,0 7,18M12.09,13.27L14.58,19.58L17.17,18.08L12.95,12.77L12.09,13.27Z</PathGeometry>
     </converters:KeyToPathConverter>
     <ControlTheme x:Key="{x:Type dialogs:ManagedFileChooser}" TargetType="dialogs:ManagedFileChooser">
         <Setter Property="dialogs:ManagedFileChooser.Template">
@@ -80,11 +80,11 @@
                             <TextBox
                                 IsVisible="{Binding !SelectingFolder}"
                                 Text="{Binding FileName}"
-                                Watermark="{DynamicResource STRING_CHOOSER_FILE_NAME}" />
+                                Watermark="File name" />
                         </DockPanel>
                         <CheckBox
                             VerticalAlignment="Center"
-                            Content="{DynamicResource STRING_CHOOSER_SHOW_HIDDEN_FILES}"
+                            Content="Show hidden files"
                             DockPanel.Dock="Left"
                             IsChecked="{Binding ShowHiddenFiles}" />
                         <UniformGrid
@@ -94,13 +94,15 @@
                             <Button
                                 Margin="8,0,0,0"
                                 Classes="Primary"
-                                Command="{Binding Ok}"
-                                Content="{DynamicResource STRING_CHOOSER_DIALOG_OK}" />
+                                Command="{Binding Ok}">
+                                OK
+                            </Button>
                             <Button
                                 Margin="8,0,0,0"
                                 Classes="Danger"
-                                Command="{Binding Cancel}"
-                                Content="{DynamicResource STRING_CHOOSER_DIALOG_CANCEL}" />
+                                Command="{Binding Cancel}">
+                                Cancel
+                            </Button>
                         </UniformGrid>
                     </DockPanel>
                     <Border

src/Semi.Avalonia/Controls/NotificationCard.axaml

@@ -37,8 +37,8 @@
                                     Height="16"
                                     Margin="16,16,12,0"
                                     VerticalAlignment="Top"
-                                    IsVisible="False"
-                                    Data="{DynamicResource NotificationCardInformationIconPathData}"/>
+                                    Data="{DynamicResource InformationIconPathData}"
+                                    IsVisible="False" />
                                 <ContentControl
                                     Name="PART_Content"
                                     MinHeight="64"
@@ -134,24 +134,24 @@
         </Style>
 
         <Style Selector="^:information /template/ PathIcon#NotificationIcon">
-            <Setter Property="IsVisible" Value="True" />
-            <Setter Property="Foreground" Value="{DynamicResource NotificationCardInformationIconForeground}" />
-            <Setter Property="Data" Value="{DynamicResource NotificationCardInformationIconPathData}" />
+            <Setter Property="PathIcon.IsVisible" Value="True" />
+            <Setter Property="PathIcon.Foreground" Value="{DynamicResource NotificationCardInformationIconForeground}" />
+            <Setter Property="PathIcon.Data" Value="{DynamicResource NotificationCardInformationIconPathData}" />
         </Style>
         <Style Selector="^:success /template/ PathIcon#NotificationIcon">
-            <Setter Property="IsVisible" Value="True" />
-            <Setter Property="Foreground" Value="{DynamicResource NotificationCardSuccessIconForeground}" />
-            <Setter Property="Data" Value="{DynamicResource NotificationCardSuccessIconPathData}" />
+            <Setter Property="PathIcon.IsVisible" Value="True" />
+            <Setter Property="PathIcon.Foreground" Value="{DynamicResource NotificationCardSuccessIconForeground}" />
+            <Setter Property="PathIcon.Data" Value="{DynamicResource NotificationCardSuccessIconPathData}" />
         </Style>
         <Style Selector="^:warning /template/ PathIcon#NotificationIcon">
-            <Setter Property="IsVisible" Value="True" />
-            <Setter Property="Foreground" Value="{DynamicResource NotificationCardWarningIconForeground}" />
-            <Setter Property="Data" Value="{DynamicResource NotificationCardWarningIconPathData}" />
+            <Setter Property="PathIcon.IsVisible" Value="True" />
+            <Setter Property="PathIcon.Foreground" Value="{DynamicResource NotificationCardWarningIconForeground}" />
+            <Setter Property="PathIcon.Data" Value="{DynamicResource NotificationCardWarningIconPathData}" />
         </Style>
         <Style Selector="^:error /template/ PathIcon#NotificationIcon">
-            <Setter Property="IsVisible" Value="True" />
-            <Setter Property="Foreground" Value="{DynamicResource NotificationCardErrorIconForeground}" />
-            <Setter Property="Data" Value="{DynamicResource NotificationCardErrorIconPathData}" />
+            <Setter Property="PathIcon.IsVisible" Value="True" />
+            <Setter Property="PathIcon.Foreground" Value="{DynamicResource NotificationCardErrorIconForeground}" />
+            <Setter Property="PathIcon.Data" Value="{DynamicResource NotificationCardErrorIconPathData}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/PathIcon.axaml

@@ -11,7 +11,6 @@
                 <Border Background="{TemplateBinding Background}">
                     <Viewbox Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
                         <Path
-                            Name="PART_Path"
                             Data="{TemplateBinding Data}"
                             Fill="{TemplateBinding Foreground}"
                             Stretch="Uniform" />
@@ -19,8 +18,5 @@
                 </Border>
             </ControlTemplate>
         </Setter>
-        <Style Selector="^.Active /template/ Path#PART_Path">
-            <Setter Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderBrush}"></Setter>
-        </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/ProgressBar.axaml

@@ -171,22 +171,22 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarPrimaryForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarSecondaryForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarTertiaryForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
         </Style>
         <Style Selector="^.Error">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
         </Style>
         <Style Selector="^:horizontal /template/ Border#PART_Indicator">
             <Setter Property="HorizontalAlignment" Value="Left" />
@@ -293,46 +293,46 @@
             <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" />
+                <Setter Property="LayoutTransformControl.Margin" Value="4 0" />
             </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" />
+                <Setter Property="LayoutTransformControl.Margin" Value="0 4" />
             </Style>
             <Style Selector="^:horizontal /template/ Border#ProgressBarRoot">
-                <Setter Property="MinHeight" Value="4" />
-                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="Border.MinHeight" Value="4" />
+                <Setter Property="Border.VerticalAlignment" Value="Center" />
             </Style>
             <Style Selector="^:vertical /template/ Border#ProgressBarRoot">
-                <Setter Property="MinWidth" Value="4" />
-                <Setter Property="HorizontalAlignment" Value="Center" />
+                <Setter Property="Border.MinWidth" Value="4" />
+                <Setter Property="Border.HorizontalAlignment" Value="Center" />
             </Style>
             <Style Selector="^ /template/ TextBlock#PART_ProgressText">
-                <Setter Property="Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
+                <Setter Property="TextBlock.Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
             </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" />
+                <Setter Property="LayoutTransformControl.Margin" Value="4 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" />
+                <Setter Property="LayoutTransformControl.Margin" Value="0 4" />
             </Style>
             <Style Selector="^:horizontal /template/ Border#ProgressBarRoot">
-                <Setter Property="MinHeight" Value="4" />
-                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="Border.MinHeight" Value="4" />
+                <Setter Property="Border.VerticalAlignment" Value="Center" />
             </Style>
             <Style Selector="^:vertical /template/ Border#ProgressBarRoot">
-                <Setter Property="MinWidth" Value="4" />
-                <Setter Property="HorizontalAlignment" Value="Center" />
+                <Setter Property="Border.MinWidth" Value="4" />
+                <Setter Property="Border.HorizontalAlignment" Value="Center" />
             </Style>
             <Style Selector="^ /template/ TextBlock#PART_ProgressText">
-                <Setter Property="Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
+                <Setter Property="TextBlock.Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
             </Style>
         </Style>
     </ControlTheme>
@@ -397,22 +397,22 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarPrimaryForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarSecondaryForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarTertiaryForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
         </Style>
         <Style Selector="^.Error">
-            <Setter Property="Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
         </Style>
         <Style Selector="^:indeterminate /template/ Arc#Indicator">
             <Setter Property="Opacity" Value="0" />

src/Semi.Avalonia/Controls/RadioButton.axaml

@@ -83,7 +83,7 @@
                 <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
 
             <!--  Unchecked Pointerover State  -->
@@ -93,7 +93,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="0" />
+                    <Setter Property="Ellipse.Opacity" Value="0" />
                 </Style>
             </Style>
 
@@ -104,7 +104,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="0" />
+                    <Setter Property="Ellipse.Opacity" Value="0" />
                 </Style>
             </Style>
 
@@ -115,7 +115,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="0" />
+                    <Setter Property="Ellipse.Opacity" Value="0" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
@@ -130,7 +130,7 @@
                 <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="1" />
+                <Setter Property="Ellipse.Opacity" Value="1" />
             </Style>
 
             <!--  Checked Pointerover State  -->
@@ -140,7 +140,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -151,7 +151,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -162,7 +162,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
@@ -201,28 +201,28 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:unchecked">
-            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="RadioButton.Background" Value="Transparent" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource RadioButtonButtonUncheckedPointeroverBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonButtonUncheckedPointeroverBackground}" />
             </Style>
             <Style Selector="^:disabled">
-                <Setter Property="Foreground" Value="{DynamicResource RadioButtonButtonUncheckedDisabledForeground}" />
+                <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonUncheckedDisabledForeground}" />
             </Style>
         </Style>
         <Style Selector="^:checked">
-            <Setter Property="Background" Value="{DynamicResource RadioButtonButtonCheckedBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource RadioButtonButtonCheckedForeground}" />
+            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonButtonCheckedBackground}" />
+            <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonCheckedForeground}" />
             <Style Selector="^:disabled">
-                <Setter Property="Foreground" Value="{DynamicResource RadioButtonButtonCheckedDisabledForeground}" />
+                <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonCheckedDisabledForeground}" />
             </Style>
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="FontSize" Value="{DynamicResource RadioButtonButtonSmallFontSize}" />
-            <Setter Property="Padding" Value="{DynamicResource RadioButtonButtonSmallPadding}" />
+            <Setter Property="RadioButton.FontSize" Value="{DynamicResource RadioButtonButtonSmallFontSize}" />
+            <Setter Property="RadioButton.Padding" Value="{DynamicResource RadioButtonButtonSmallPadding}" />
         </Style>
         <Style Selector="^.Large">
-            <Setter Property="FontSize" Value="{DynamicResource RadioButtonButtonLargeFontSize}" />
-            <Setter Property="Padding" Value="{DynamicResource RadioButtonButtonLargePadding}" />
+            <Setter Property="RadioButton.FontSize" Value="{DynamicResource RadioButtonButtonLargeFontSize}" />
+            <Setter Property="RadioButton.Padding" Value="{DynamicResource RadioButtonButtonLargePadding}" />
         </Style>
     </ControlTheme>
 
@@ -294,28 +294,28 @@
                 <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="0" />
+                <Setter Property="Ellipse.Opacity" Value="0" />
             </Style>
 
             <!--  Unchecked Pointerover State  -->
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource RadioButtonCardUncheckPointeroverBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPointeroverBackground}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconPointeroverBorderBrush}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="0" />
+                    <Setter Property="Ellipse.Opacity" Value="0" />
                 </Style>
             </Style>
 
             <!--  Unchecked Pressed State  -->
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconPressedBorderBrush}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="0" />
+                    <Setter Property="Ellipse.Opacity" Value="0" />
                 </Style>
             </Style>
 
@@ -326,7 +326,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="0" />
+                    <Setter Property="Ellipse.Opacity" Value="0" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
@@ -336,19 +336,19 @@
 
         <!--  Checked State  -->
         <Style Selector="^:checked">
-            <Setter Property="Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
+            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
+            <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
             <Style Selector="^ /template/ Ellipse#OuterEllipse">
                 <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconDefaultBorderBrush}" />
                 <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Opacity" Value="1" />
+                <Setter Property="Ellipse.Opacity" Value="1" />
             </Style>
 
             <!--  Checked Pointerover State  -->
             <Style Selector="^:pointerover">
-                <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointeroverBorderBrush}" />
+                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointeroverBorderBrush}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconPointeroverBorderBrush}" />
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointeroverBackground}" />
@@ -358,19 +358,19 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
             <!--  Checked Pressed State  -->
             <Style Selector="^:pressed">
-                <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
+                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconPressedBorderBrush}" />
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -381,7 +381,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Opacity" Value="1" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                 </Style>
                 <Style Selector="^ /template/ Border#RootBorder">
                     <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
@@ -421,12 +421,12 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:unchecked">
-            <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardDefaultBorderBrush}" />
+            <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardDefaultBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource RadioButtonCardUncheckPointeroverBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
             </Style>
             <Style Selector="^:disabled">
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
@@ -435,13 +435,13 @@
             </Style>
         </Style>
         <Style Selector="^:checked">
-            <Setter Property="Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
+            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
+            <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointeroverBorderBrush}" />
+                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
+                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
             </Style>
             <Style Selector="^:disabled">
                 <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />

src/Semi.Avalonia/Controls/RepeatButton.axaml

@@ -41,45 +41,45 @@
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
         <Style Selector="^.Large">
-            <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
+            <Setter Property="RepeatButton.Padding" Value="{DynamicResource ButtonLargePadding}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
+            <Setter Property="RepeatButton.Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
 
@@ -92,88 +92,88 @@
         <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
 
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
+                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
+                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 
@@ -184,9 +184,9 @@
         <Setter Property="RepeatButton.Background" Value="Transparent" />
         <Setter Property="RepeatButton.BorderBrush" Value="Transparent" />
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="RepeatButton.BorderBrush" Value="Transparent" />
+            <Setter Property="RepeatButton.Background" Value="Transparent" />
+            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
     </ControlTheme>

src/Semi.Avalonia/Controls/ScrollViewer.axaml

@@ -65,7 +65,6 @@
                                 Minimum="{TemplateBinding Minimum}"
                                 Orientation="{TemplateBinding Orientation}"
                                 ViewportSize="{TemplateBinding ViewportSize}"
-                                DeferThumbDrag="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
                                 Value="{TemplateBinding Value,
                                                         Mode=TwoWay}">
                                 <Track.DecreaseButton>
@@ -137,7 +136,6 @@
                                 Minimum="{TemplateBinding Minimum}"
                                 Orientation="{TemplateBinding Orientation}"
                                 ViewportSize="{TemplateBinding ViewportSize}"
-                                DeferThumbDrag="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
                                 Value="{TemplateBinding Value,
                                                         Mode=TwoWay}">
                                 <Track.DecreaseButton>
@@ -243,21 +241,21 @@
                         Name="PART_HorizontalScrollBar"
                         Grid.Row="1"
                         Grid.Column="0"
+                        Opacity="0"
                         Orientation="Horizontal" />
                     <ScrollBar
                         Name="PART_VerticalScrollBar"
                         Grid.Row="0"
                         Grid.Column="1"
+                        Opacity="0"
                         Orientation="Vertical" />
                     <Panel
                         Grid.Row="1"
-                        Grid.Column="1" />
+                        Grid.Column="1"
+                        Background="{DynamicResource ColorScrollBarBackground}" />
                 </Grid>
             </ControlTemplate>
         </Setter>
-        <Style Selector="^ /template/ ScrollBar">
-            <Setter Property="Opacity" Value="0"></Setter>
-        </Style>
         <Style Selector="^:pointerover">
             <Style Selector="^ /template/ ScrollBar#PART_HorizontalScrollBar">
                 <Setter Property="Opacity" Value="1" />
@@ -301,7 +299,8 @@
                         Orientation="Vertical" />
                     <Panel
                         Grid.Row="1"
-                        Grid.Column="1" />
+                        Grid.Column="1"
+                        Background="{DynamicResource ColorScrollBarBackground}" />
                 </Grid>
             </ControlTemplate>
         </Setter>

src/Semi.Avalonia/Controls/SelectableTextBlock.axaml

@@ -7,7 +7,7 @@
         <MenuItem
             x:Name="SelectableTextBlockContextFlyoutCopyItem"
             Command="{Binding $parent[SelectableTextBlock].Copy}"
-            Header="{DynamicResource STRING_MENU_COPY}"
+            Header="Copy"
             InputGesture="{x:Static TextBox.CopyGesture}"
             IsEnabled="{Binding $parent[SelectableTextBlock].CanCopy}" />
     </MenuFlyout>
@@ -18,34 +18,34 @@
         <Setter Property="SelectableTextBlock.Cursor" Value="Ibeam" />
         <Setter Property="SelectableTextBlock.SelectionBrush" Value="{DynamicResource TextBlockSelectionBackground}" />
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
+            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
+            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
         </Style>
         <Style Selector="^.Quaternary">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
-        </Style>
-        <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
+            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
+            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
+            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
+        </Style>
+        <Style Selector="^.Success">
+            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
         </Style>
         <Style Selector="^.Mark">
-            <Setter Property="Background" Value="{DynamicResource TextBlockMarkBackground}" />
+            <Setter Property="SelectableTextBlock.Background" Value="{DynamicResource TextBlockMarkBackground}" />
         </Style>
         <Style Selector="^.Underline">
-            <Setter Property="TextDecorations" Value="Underline" />
+            <Setter Property="SelectableTextBlock.TextDecorations" Value="Underline" />
         </Style>
         <Style Selector="^.Delete">
-            <Setter Property="TextDecorations" Value="StrikeThrough" />
+            <Setter Property="SelectableTextBlock.TextDecorations" Value="StrikeThrough" />
         </Style>
         <Style Selector="^.Underline.Delete">
-            <Setter Property="TextDecorations">
+            <Setter Property="TextBlock.TextDecorations">
                 <TextDecorationCollection>
                     <TextDecoration Location="Underline" />
                     <TextDecoration Location="Strikethrough" />
@@ -53,7 +53,7 @@
             </Setter>
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
+            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
         </Style>
         <Style Selector="^[IsEnabled=True]">
             <Setter Property="ContextFlyout" Value="{StaticResource SelectableTextBlockContextFlyout}" />
@@ -65,25 +65,25 @@
         TargetType="SelectableTextBlock">
         <Setter Property="SelectableTextBlock.FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
         <Style Selector="^.H1">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
+            <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
         </Style>
         <Style Selector="^.H2">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH2FontSize}" />
+            <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockTitleH2FontSize}" />
         </Style>
         <Style Selector="^.H3">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH3FontSize}" />
+            <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockTitleH3FontSize}" />
         </Style>
         <Style Selector="^.H4">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH4FontSize}" />
+            <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockTitleH4FontSize}" />
         </Style>
         <Style Selector="^.H5">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH5FontSize}" />
+            <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockTitleH5FontSize}" />
         </Style>
         <Style Selector="^.H6">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
+            <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
+            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/Slider.axaml

@@ -155,6 +155,7 @@
                     <DataValidationErrors>
                         <Grid
                             x:Name="SliderContainer"
+                            MinWidth="{DynamicResource SliderVerticalWidth}"
                             Margin="{TemplateBinding Padding}"
                             Background="{DynamicResource SliderContainerBackground}"
                             ColumnDefinitions="Auto,Auto,Auto">
@@ -253,7 +254,7 @@
         </Style>
 
         <Style Selector="^:error /template/ Thumb#thumb">
-            <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+            <Setter Property="Thumb.BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
         </Style>
 
         <!--  Disabled State  -->
@@ -268,7 +269,7 @@
             </Style>
 
             <Style Selector="^ /template/ Thumb">
-                <Setter Property="BorderBrush" Value="{DynamicResource SliderThumbDisabledBorderBrush}" />
+                <Setter Property="Thumb.BorderBrush" Value="{DynamicResource SliderThumbDisabledBorderBrush}" />
             </Style>
         </Style>
 

src/Semi.Avalonia/Controls/SplitButton.axaml

@@ -137,77 +137,77 @@
         <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
         <Style Selector="^ /template/ Button">
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^.Primary /template/ Button">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
             </Style>
         </Style>
         <Style Selector="^.Secondary /template/ Button">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
+                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
+                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
             </Style>
         </Style>
         <Style Selector="^.Tertiary /template/ Button">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
+                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
+                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
             </Style>
         </Style>
         <Style Selector="^.Success /template/ Button">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
+                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
+                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
             </Style>
         </Style>
         <Style Selector="^.Warning /template/ Button">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
+                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
+                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
             </Style>
         </Style>
         <Style Selector="^.Danger /template/ Button">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
+                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
+                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^:disabled /template/ Button">
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 
@@ -218,9 +218,9 @@
         <Setter Property="SplitButton.Background" Value="Transparent" />
         <Setter Property="SplitButton.BorderBrush" Value="Transparent" />
         <Style Selector="^:disabled /template/ Button">
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="SplitButton.BorderBrush" Value="Transparent" />
+            <Setter Property="SplitButton.Background" Value="Transparent" />
+            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/TabControl.axaml

@@ -40,24 +40,24 @@
             <Setter Property="Orientation" Value="Vertical" />
         </Style>
         <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Width" Value="1" />
-            <Setter Property="VerticalAlignment" Value="Stretch" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="Border.Width" Value="1" />
+            <Setter Property="Border.VerticalAlignment" Value="Stretch" />
+            <Setter Property="Border.HorizontalAlignment" Value="Left" />
         </Style>
         <Style Selector="^[TabStripPlacement=Right] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Width" Value="1" />
-            <Setter Property="VerticalAlignment" Value="Stretch" />
-            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="Border.Width" Value="1" />
+            <Setter Property="Border.VerticalAlignment" Value="Stretch" />
+            <Setter Property="Border.HorizontalAlignment" Value="Right" />
         </Style>
         <Style Selector="^[TabStripPlacement=Top] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Height" Value="1" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Bottom" />
+            <Setter Property="Border.Height" Value="1" />
+            <Setter Property="Border.HorizontalAlignment" Value="Stretch" />
+            <Setter Property="Border.VerticalAlignment" Value="Bottom" />
         </Style>
         <Style Selector="^[TabStripPlacement=Bottom] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Height" Value="1" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="Border.Height" Value="1" />
+            <Setter Property="Border.HorizontalAlignment" Value="Stretch" />
+            <Setter Property="Border.VerticalAlignment" Value="Top" />
         </Style>
         <!--
         <Style Selector="^[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
@@ -65,90 +65,4 @@
         </Style>
         -->
     </ControlTheme>
-    
-    <ControlTheme x:Key="ScrollTabControl" TargetType="TabControl">
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Background" Value="{DynamicResource TabControlBackground}" />
-        <Setter Property="ItemsPanel">
-            <ItemsPanelTemplate>
-                <VirtualizingStackPanel Orientation="Horizontal" />
-            </ItemsPanelTemplate>
-        </Setter>
-        <Setter Property="Template">
-            <ControlTemplate TargetType="TabControl">
-                <Border
-                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                    VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}">
-                    <DockPanel>
-                        <Panel DockPanel.Dock="{TemplateBinding TabStripPlacement}">
-                            <ScrollViewer Name="PART_ScrollViewer">
-                                <ItemsPresenter Name="PART_ItemsPresenter" ItemsPanel="{TemplateBinding ItemsPanel}" Margin="0 0 12 12"/>
-                            </ScrollViewer>
-                            <Border Name="PART_BorderSeparator" Background="{DynamicResource TabItemLinePipePressedBorderBrush}" />
-                        </Panel>
-                        <ContentPresenter
-                            Name="PART_SelectedContentHost"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding SelectedContent}"
-                            ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
-                    </DockPanel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-        
-        <Style Selector="^[TabStripPlacement=Left], ^[TabStripPlacement=Right]">
-            <Style Selector="^ /template/ ItemsPresenter">
-                <Setter Property="ItemsPanel">
-                    <ItemsPanelTemplate>
-                        <VirtualizingStackPanel Orientation="Vertical"></VirtualizingStackPanel>
-                    </ItemsPanelTemplate>
-                </Setter>
-            </Style>
-        </Style>
-        <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Width" Value="1" />
-            <Setter Property="VerticalAlignment" Value="Stretch" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
-        </Style>
-        <Style Selector="^[TabStripPlacement=Left] /template/ ScrollViewer#PART_ScrollViewer">
-            <Setter Property="HorizontalScrollBarVisibility" Value="Disabled" />
-            <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-        </Style>
-        <Style Selector="^[TabStripPlacement=Right] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Width" Value="1" />
-            <Setter Property="VerticalAlignment" Value="Stretch" />
-            <Setter Property="HorizontalAlignment" Value="Right" />
-            <Setter Property="Margin" Value="0 0 12 0"></Setter>
-        </Style>
-        <Style Selector="^[TabStripPlacement=Right] /template/ ScrollViewer#PART_ScrollViewer">
-            <Setter Property="HorizontalScrollBarVisibility" Value="Disabled" />
-            <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-        </Style>
-        <Style Selector="^[TabStripPlacement=Top] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Height" Value="1" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Bottom" />
-            <Setter Property="Margin" Value="0 0 0 12"></Setter>
-        </Style>
-        <Style Selector="^[TabStripPlacement=Top] /template/ ScrollViewer#PART_ScrollViewer">
-            <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
-            <Setter Property="VerticalScrollBarVisibility" Value="Disabled" />
-        </Style>
-        <Style Selector="^[TabStripPlacement=Bottom] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Height" Value="1" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Top" />
-        </Style>
-        <Style Selector="^[TabStripPlacement=Bottom] /template/ ScrollViewer#PART_ScrollViewer">
-            <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
-            <Setter Property="VerticalScrollBarVisibility" Value="Disabled" />
-        </Style>
-    </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/TabItem.axaml

@@ -50,24 +50,24 @@
         <!--  Selected state  -->
         <Style Selector="^:selected /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderSelectedForeground}" />
-            <Setter Property="FontWeight" Value="{DynamicResource TabItemSelectedFontWeight}" />
+            <Setter Property="ContentPresenter.FontWeight" Value="{DynamicResource TabItemSelectedFontWeight}" />
         </Style>
 
         <Style Selector="^:not(:selected)">
             <Setter Property="Cursor" Value="Hand" />
             <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderPointeroverForeground}" />
+                <Setter Property="ContentPresenter.Foreground" Value="{DynamicResource TabItemLineHeaderPointeroverForeground}" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#PART_SelectedPipe">
-                <Setter Property="Background" Value="{DynamicResource TabItemLinePipePointeroverBorderBrush}" />
+                <Setter Property="Border.Background" Value="{DynamicResource TabItemLinePipePointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed /template/ Border#PART_SelectedPipe">
-                <Setter Property="Background" Value="{DynamicResource TabItemLinePipePressedBorderBrush}" />
+                <Setter Property="Border.Background" Value="{DynamicResource TabItemLinePipePressedBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
-            <Setter Property="Background" Value="{DynamicResource TabItemLinePipeSelectedBackground}" />
+            <Setter Property="Border.Background" Value="{DynamicResource TabItemLinePipeSelectedBackground}" />
         </Style>
 
         <!--  Selected Pressed state  -->
@@ -85,10 +85,10 @@
         <!--  TabStripPlacement States Group  -->
         <Style Selector="^[TabStripPlacement=Top]">
             <Style Selector="^ /template/Border#PART_SelectedPipe">
-                <Setter Property="Height" Value="2" />
-                <Setter Property="Margin" Value="0" />
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
-                <Setter Property="VerticalAlignment" Value="Bottom" />
+                <Setter Property="Border.Height" Value="2" />
+                <Setter Property="Border.Margin" Value="0" />
+                <Setter Property="Border.HorizontalAlignment" Value="Stretch" />
+                <Setter Property="Border.VerticalAlignment" Value="Bottom" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Margin" Value="0,0,0,4" />
@@ -96,10 +96,10 @@
         </Style>
         <Style Selector="^[TabStripPlacement=Bottom]">
             <Style Selector="^ /template/Border#PART_SelectedPipe">
-                <Setter Property="Height" Value="2" />
-                <Setter Property="Margin" Value="0" />
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
-                <Setter Property="VerticalAlignment" Value="Top" />
+                <Setter Property="Border.Height" Value="2" />
+                <Setter Property="Border.Margin" Value="0" />
+                <Setter Property="Border.HorizontalAlignment" Value="Stretch" />
+                <Setter Property="Border.VerticalAlignment" Value="Top" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Margin" Value="0,4,0,0" />
@@ -107,22 +107,22 @@
         </Style>
         <Style Selector="^[TabStripPlacement=Left]">
             <Style Selector="^/template/ Border#PART_SelectedPipe">
-                <Setter Property="Width" Value="2" />
-                <Setter Property="Margin" Value="0" />
-                <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="VerticalAlignment" Value="Stretch" />
+                <Setter Property="Border.Width" Value="2" />
+                <Setter Property="Border.Margin" Value="0" />
+                <Setter Property="Border.HorizontalAlignment" Value="Left" />
+                <Setter Property="Border.VerticalAlignment" Value="Stretch" />
             </Style>
             <Style Selector="^ /template/ Label#PART_ContentPresenter">
                 <Setter Property="Margin" Value="8,0,0,0" />
             </Style>
         </Style>
         <Style Selector="^[TabStripPlacement=Right]">
-            <Setter Property="HorizontalContentAlignment" Value="Right" />
+            <Setter Property="TabItem.HorizontalContentAlignment" Value="Right" />
             <Style Selector="^ /template/ Border#PART_SelectedPipe">
-                <Setter Property="Width" Value="2" />
-                <Setter Property="Margin" Value="0" />
-                <Setter Property="HorizontalAlignment" Value="Right" />
-                <Setter Property="VerticalAlignment" Value="Stretch" />
+                <Setter Property="Border.Width" Value="2" />
+                <Setter Property="Border.Margin" Value="0" />
+                <Setter Property="Border.HorizontalAlignment" Value="Right" />
+                <Setter Property="Border.VerticalAlignment" Value="Stretch" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Margin" Value="0,0,8,0" />

src/Semi.Avalonia/Controls/TabStrip.axaml

@@ -75,24 +75,24 @@
         <!--  Selected state  -->
         <Style Selector="^:selected /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderSelectedForeground}" />
-            <Setter Property="FontWeight" Value="{DynamicResource TabItemSelectedFontWeight}" />
+            <Setter Property="ContentPresenter.FontWeight" Value="{DynamicResource TabItemSelectedFontWeight}" />
         </Style>
 
         <Style Selector="^:not(:selected)">
             <Setter Property="Cursor" Value="Hand" />
             <Style Selector="^:pointerover /template/ Label#PART_ContentPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderPointeroverForeground}" />
+                <Setter Property="Label.Foreground" Value="{DynamicResource TabItemLineHeaderPointeroverForeground}" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#PART_SelectedPipe">
-                <Setter Property="Background" Value="{DynamicResource TabItemLinePipePointeroverBorderBrush}" />
+                <Setter Property="Border.Background" Value="{DynamicResource TabItemLinePipePointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed /template/ Border#PART_SelectedPipe">
-                <Setter Property="Background" Value="{DynamicResource TabItemLinePipePressedBorderBrush}" />
+                <Setter Property="Border.Background" Value="{DynamicResource TabItemLinePipePressedBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
-            <Setter Property="Background" Value="{DynamicResource TabItemLinePipeSelectedBackground}" />
+            <Setter Property="Border.Background" Value="{DynamicResource TabItemLinePipeSelectedBackground}" />
         </Style>
 
         <!--  Selected Pressed state  -->

src/Semi.Avalonia/Controls/TextBlock.axaml

@@ -10,34 +10,34 @@
     <ControlTheme x:Key="{x:Type TextBlock}" TargetType="TextBlock">
         <!--<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockDefaultForeground}" />-->
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
         </Style>
         <Style Selector="^.Quaternary">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
-        </Style>
-        <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
+        </Style>
+        <Style Selector="^.Success">
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
         </Style>
         <Style Selector="^.Mark">
-            <Setter Property="Background" Value="{DynamicResource TextBlockMarkBackground}" />
+            <Setter Property="TextBlock.Background" Value="{DynamicResource TextBlockMarkBackground}" />
         </Style>
         <Style Selector="^.Underline">
-            <Setter Property="TextDecorations" Value="Underline" />
+            <Setter Property="TextBlock.TextDecorations" Value="Underline" />
         </Style>
         <Style Selector="^.Delete">
-            <Setter Property="TextDecorations" Value="StrikeThrough" />
+            <Setter Property="TextBlock.TextDecorations" Value="StrikeThrough" />
         </Style>
         <Style Selector="^.Underline.Delete">
-            <Setter Property="TextDecorations">
+            <Setter Property="TextBlock.TextDecorations">
                 <TextDecorationCollection>
                     <TextDecoration Location="Underline" />
                     <TextDecoration Location="Strikethrough" />
@@ -45,7 +45,7 @@
             </Setter>
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
         </Style>
     </ControlTheme>
     <ControlTheme
@@ -54,25 +54,25 @@
         TargetType="TextBlock">
         <Setter Property="TextBlock.FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
         <Style Selector="^.H1">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
+            <Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
         </Style>
         <Style Selector="^.H2">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH2FontSize}" />
+            <Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockTitleH2FontSize}" />
         </Style>
         <Style Selector="^.H3">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH3FontSize}" />
+            <Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockTitleH3FontSize}" />
         </Style>
         <Style Selector="^.H4">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH4FontSize}" />
+            <Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockTitleH4FontSize}" />
         </Style>
         <Style Selector="^.H5">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH5FontSize}" />
+            <Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockTitleH5FontSize}" />
         </Style>
         <Style Selector="^.H6">
-            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
+            <Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
+            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/TextBox.axaml

@@ -2,29 +2,68 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
+    <Design.PreviewWith>
+        <StackPanel
+            Width="200"
+            Margin="20"
+            Spacing="20">
+            <TextBox
+                Classes="clearButton"
+                Text="Hello"
+                Theme="{StaticResource BorderlessTextBox}" />
+            <TextBox
+                Classes="Large"
+                Text="Hello"
+                Theme="{StaticResource BorderlessTextBox}" />
+            <TextBox
+                Classes="Small"
+                Text="Hello"
+                Theme="{StaticResource BorderlessTextBox}" />
+        </StackPanel>
+    </Design.PreviewWith>
+
     <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
         <MenuItem
             x:Name="TextBoxContextFlyoutCutItem"
             Command="{Binding $parent[TextBox].Cut}"
-            Header="{DynamicResource STRING_MENU_CUT}"
+            Header="Cut"
             InputGesture="{x:Static TextBox.CutGesture}"
             IsEnabled="{Binding $parent[TextBox].CanCut}" />
         <MenuItem
             x:Name="TextBoxContextFlyoutCopyItem"
             Command="{Binding $parent[TextBox].Copy}"
-            Header="{DynamicResource STRING_MENU_COPY}"
+            Header="Copy"
             InputGesture="{x:Static TextBox.CopyGesture}"
             IsEnabled="{Binding $parent[TextBox].CanCopy}" />
         <MenuItem
             x:Name="TextBoxContextFlyoutPasteItem"
             Command="{Binding $parent[TextBox].Paste}"
-            Header="{DynamicResource STRING_MENU_PASTE}"
+            Header="Paste"
             InputGesture="{x:Static TextBox.PasteGesture}"
             IsEnabled="{Binding $parent[TextBox].CanPaste}" />
     </MenuFlyout>
 
     <ControlTheme x:Key="{x:Type TextBox}" TargetType="TextBox">
         <ControlTheme.Resources>
+            <ControlTheme x:Key="InputClearButton" TargetType="Button">
+                <Setter Property="Button.Foreground" Value="{DynamicResource TextBoxButtonDefaultForeground}" />
+                <Setter Property="Button.Cursor" Value="Hand" />
+                <Setter Property="Button.Template">
+                    <ControlTemplate TargetType="Button">
+                        <!--  Background must be transparent or hit test will fail  -->
+                        <ContentControl Background="Transparent">
+                            <PathIcon
+                                Width="16"
+                                Height="16"
+                                Data="{DynamicResource TextBoxClearButtonData}"
+                                Foreground="{TemplateBinding Foreground}" />
+                        </ContentControl>
+                    </ControlTemplate>
+                </Setter>
+                <Style Selector="^:pointerover">
+                    <Setter Property="Button.Foreground" Value="{DynamicResource TextBoxButtonPointeroverForeground}" />
+                </Style>
+            </ControlTheme>
             <ControlTheme x:Key="InputToggleButton" TargetType="ToggleButton">
                 <Setter Property="ToggleButton.Foreground" Value="{DynamicResource TextBoxButtonDefaultForeground}" />
                 <Setter Property="ToggleButton.Cursor" Value="Hand" />
@@ -91,17 +130,12 @@
                                         Name="PART_Watermark"
                                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        IsVisible="{TemplateBinding Text,
+                                                                    Converter={x:Static StringConverters.IsNullOrEmpty}}"
                                         Opacity="0.5"
                                         Text="{TemplateBinding Watermark}"
                                         TextAlignment="{TemplateBinding TextAlignment}"
-                                        TextWrapping="{TemplateBinding TextWrapping}">
-                                        <TextBlock.IsVisible>
-                                            <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                                <Binding ElementName="PART_TextPresenter" Path="PreeditText" Converter="{x:Static StringConverters.IsNullOrEmpty}"/>
-                                                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Text" Converter="{x:Static StringConverters.IsNullOrEmpty}"/>
-                                            </MultiBinding>
-                                        </TextBlock.IsVisible>
-                                    </TextBlock>
+                                        TextWrapping="{TemplateBinding TextWrapping}" />
                                     <TextPresenter
                                         Name="PART_TextPresenter"
                                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -125,9 +159,8 @@
                                 Name="PART_ClearButton"
                                 Grid.Column="2"
                                 Command="{Binding $parent[TextBox].Clear}"
-                                Content="{DynamicResource IconButtonClearData}"
                                 IsVisible="False"
-                                Theme="{StaticResource InnerIconButton}" />
+                                Theme="{StaticResource InputClearButton}" />
                             <ToggleButton
                                 Name="PART_RevealButton"
                                 Grid.Column="3"
@@ -150,20 +183,20 @@
         </Setter>
 
         <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
+            <Setter Property="Border.Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
         </Style>
         <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Background" Value="{DynamicResource TextBoxPressedBackground}" />
+            <Setter Property="Border.Background" Value="{DynamicResource TextBoxPressedBackground}" />
         </Style>
         <Style Selector="^:focus /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
+            <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:disabled /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource TextBoxDisabledBackground}" />
+            <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
+            <Setter Property="Border.Background" Value="{DynamicResource TextBoxDisabledBackground}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
+            <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
         </Style>
 
         <Style Selector="^:error">
@@ -172,30 +205,30 @@
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
-                <Setter Property="BorderBrush" Value="Transparent" />
+                <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                <Setter Property="Border.BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
-                <Setter Property="BorderBrush" Value="Transparent" />
+                <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
+                <Setter Property="Border.BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:focus /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+                <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
+                <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^.clearButton, ^.ClearButton">
             <Style Selector="^[AcceptsReturn=False][IsReadOnly=False]:focus:not(:empty) /template/ Button#PART_ClearButton">
-                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Button.IsVisible" Value="True" />
             </Style>
             <Style Selector="^[AcceptsReturn=False][IsReadOnly=False]:pointerover:not(:empty) /template/ Button#PART_ClearButton">
-                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Button.IsVisible" Value="True" />
             </Style>
         </Style>
         <Style Selector="^.revealPasswordButton, ^.RevealPasswordButton">
             <Style Selector="^ /template/ ToggleButton#PART_RevealButton">
-                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="ToggleButton.IsVisible" Value="True" />
             </Style>
         </Style>
         <Style Selector="^.Large /template/ Border#PART_ContentPresenterBorder">
@@ -206,15 +239,15 @@
         </Style>
 
         <Style Selector="^.Bordered">
-            <Setter Property="Background" Value="{DynamicResource TextBoxBorderedDefaultBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderedDefaultBorderBrush}" />
+            <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxBorderedDefaultBackground}" />
+            <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxBorderedDefaultBorderBrush}" />
             <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Background" Value="{DynamicResource TextBoxBorderedPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderedPointeroverBorderBrush}" />
+                <Setter Property="Border.Background" Value="{DynamicResource TextBoxBorderedPointeroverBackground}" />
+                <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxBorderedPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:focus">
-                <Setter Property="Background" Value="{DynamicResource TextBoxBorderedPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderedPointeroverBorderBrush}" />
+                <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxBorderedPointeroverBackground}" />
+                <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxBorderedPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:disabled /template/ Border#PART_ContentPresenterBorder">
                 <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxDisabledBackground}" />
@@ -227,16 +260,16 @@
                     <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsBorderBrush}" />
                 </Style>
                 <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
+                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
                 </Style>
                 <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPressedBorderBrush}" />
+                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
+                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsPressedBorderBrush}" />
                 </Style>
                 <Style Selector="^:focus /template/ Border#PART_ContentPresenterBorder">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
+                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
                 </Style>
             </Style>
         </Style>
@@ -320,20 +353,20 @@
         </Setter>
 
         <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
+            <Setter Property="Border.Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
         </Style>
         <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Background" Value="{DynamicResource TextBoxPressedBackground}" />
+            <Setter Property="Border.Background" Value="{DynamicResource TextBoxPressedBackground}" />
         </Style>
         <Style Selector="^:focus /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
+            <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:disabled /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource TextBoxDisabledBackground}" />
+            <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
+            <Setter Property="Border.Background" Value="{DynamicResource TextBoxDisabledBackground}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
+            <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
         </Style>
 
         <Style Selector="^:error">
@@ -342,16 +375,16 @@
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
-                <Setter Property="BorderBrush" Value="Transparent" />
+                <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                <Setter Property="Border.BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
-                <Setter Property="BorderBrush" Value="Transparent" />
+                <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
+                <Setter Property="Border.BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:focus /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+                <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
+                <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
             </Style>
         </Style>
     </ControlTheme>

src/Semi.Avalonia/Controls/TimePicker.axaml

@@ -139,17 +139,11 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <DataValidationErrors>
-                    <Grid
-                        Name="LayoutRoot"
-                        Margin="{TemplateBinding Padding}"
-                        ColumnDefinitions="*, Auto">
+                    <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}">
                         <Button
                             x:Name="PART_FlyoutButton"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
                             Width="242"
                             MinWidth="242"
-                            MinHeight="{DynamicResource DateTimePickerButtonDefaultHeight}"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             Background="{TemplateBinding Background}"
@@ -160,6 +154,7 @@
                             DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                             Foreground="{TemplateBinding Foreground}"
                             IsEnabled="{TemplateBinding IsEnabled}"
+                            MinHeight="{DynamicResource DateTimePickerButtonDefaultHeight}"
                             Theme="{StaticResource DateTimePickerFlyoutButton}">
                             <Grid ColumnDefinitions="*, Auto">
                                 <Grid Name="PART_FlyoutButtonContentGrid" Grid.Column="0">
@@ -239,36 +234,16 @@
 
                         <Popup
                             Name="PART_Popup"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
                             IsLightDismissEnabled="True"
                             Placement="Bottom"
                             PlacementTarget="{TemplateBinding}"
                             WindowManagerAddShadowHint="False">
                             <TimePickerPresenter Name="PART_PickerPresenter" />
                         </Popup>
-
-                        <Button
-                            Name="ClearButton"
-                            Grid.Column="1"
-                            Margin="0,0,8,0"
-                            Command="{Binding $parent[TimePicker].Clear}"
-                            Content="{DynamicResource IconButtonClearData}"
-                            IsVisible="False"
-                            Theme="{DynamicResource InnerIconButton}" />
                     </Grid>
                 </DataValidationErrors>
             </ControlTemplate>
         </Setter>
-        
-        <Style Selector="^.clearButton:pointerover, ^.ClearButton:pointerover">
-            <Style Selector="^:not(:hasnotime) /template/ Button#ClearButton">
-                <Setter Property="IsVisible" Value="True" />
-            </Style>
-            <Style Selector="^:not(:hasnotime) /template/ PathIcon#PART_Icon">
-                <Setter Property="Opacity" Value="0" />
-            </Style>
-        </Style>
 
         <Style Selector="^:disabled /template/ PathIcon#PART_Icon">
             <Setter Property="Foreground" Value="{DynamicResource DateTimePickerButtonDisabledIconForeground}" />

src/Semi.Avalonia/Controls/ToggleButton.axaml

@@ -58,203 +58,203 @@
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource ToggleButtonDefaultPointeroverBackground}" />
+            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDefaultPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource ToggleButtonDefaultPressedBackground}" />
+            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDefaultPressedBackground}" />
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDefaultDisabledBorderBrush}" />
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultPrimaryForeground}" />
+            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultSecondaryForeground}" />
+            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultTertiaryForeground}" />
+            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultSuccessForeground}" />
+            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultWarningForeground}" />
+            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultDangerForeground}" />
+            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultDangerForeground}" />
         </Style>
 
         <Style Selector="^:checked">
-            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonCheckedForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedBackground}" />
+            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonCheckedForeground}" />
+            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedBackground}" />
             <Style Selector="^.Primary">
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedBackground}" />
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedBackground}" />
             </Style>
             <Style Selector="^.Secondary">
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonSecondaryCheckedBackground}" />
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSecondaryCheckedBackground}" />
             </Style>
             <Style Selector="^.Tertiary">
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonTertiaryCheckedBackground}" />
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonTertiaryCheckedBackground}" />
             </Style>
             <Style Selector="^.Success">
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonSuccessCheckedBackground}" />
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSuccessCheckedBackground}" />
             </Style>
             <Style Selector="^.Warning">
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonWarningCheckedBackground}" />
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonWarningCheckedBackground}" />
             </Style>
             <Style Selector="^.Danger">
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonDangerCheckedBackground}" />
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDangerCheckedBackground}" />
             </Style>
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPointeroverBackground}" />
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPointeroverBackground}" />
                 <Style Selector="^.Primary">
-                    <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPointeroverBackground}" />
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPointeroverBackground}" />
                 </Style>
                 <Style Selector="^.Secondary">
-                    <Setter Property="Background" Value="{DynamicResource ToggleButtonSecondaryCheckedPointeroverBackground}" />
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSecondaryCheckedPointeroverBackground}" />
                 </Style>
                 <Style Selector="^.Tertiary">
-                    <Setter Property="Background" Value="{DynamicResource ToggleButtonTertiaryCheckedPointeroverBackground}" />
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonTertiaryCheckedPointeroverBackground}" />
                 </Style>
                 <Style Selector="^.Success">
-                    <Setter Property="Background" Value="{DynamicResource ToggleButtonSuccessCheckedPointeroverBackground}" />
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSuccessCheckedPointeroverBackground}" />
                 </Style>
                 <Style Selector="^.Warning">
-                    <Setter Property="Background" Value="{DynamicResource ToggleButtonWarningCheckedPointeroverBackground}" />
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonWarningCheckedPointeroverBackground}" />
                 </Style>
                 <Style Selector="^.Danger">
-                    <Setter Property="Background" Value="{DynamicResource ToggleButtonDangerCheckedPointeroverBackground}" />
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDangerCheckedPointeroverBackground}" />
                 </Style>
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedBackground}" />
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedBackground}" />
                 <Style Selector="^.Primary">
-                    <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedBackground}" />
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedBackground}" />
                 </Style>
                 <Style Selector="^.Secondary">
-                    <Setter Property="Background" Value="{DynamicResource ToggleButtonSecondaryCheckedPressedBackground}" />
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSecondaryCheckedPressedBackground}" />
                 </Style>
                 <Style Selector="^.Tertiary">
-                    <Setter Property="Background" Value="{DynamicResource ToggleButtonTertiaryCheckedPressedBackground}" />
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonTertiaryCheckedPressedBackground}" />
                 </Style>
                 <Style Selector="^.Success">
-                    <Setter Property="Background" Value="{DynamicResource ToggleButtonSuccessCheckedPressedBackground}" />
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSuccessCheckedPressedBackground}" />
                 </Style>
                 <Style Selector="^.Warning">
-                    <Setter Property="Background" Value="{DynamicResource ToggleButtonWarningCheckedPressedBackground}" />
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonWarningCheckedPressedBackground}" />
                 </Style>
                 <Style Selector="^.Danger">
-                    <Setter Property="Background" Value="{DynamicResource ToggleButtonDangerCheckedPressedBackground}" />
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDangerCheckedPressedBackground}" />
                 </Style>
             </Style>
             <Style Selector="^:disabled">
-                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonDefaultDisabledBorderBrush}" />
+                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDefaultDisabledBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^:indeterminate">
-            <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBackground}" />
+            <Setter Property="ToggleButton.BorderThickness" Value="1" />
+            <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBorderBrush}" />
+            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBackground}" />
             <Style Selector="^.Primary">
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBorderBrush}" />
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBackground}" />
+                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBorderBrush}" />
             </Style>
             <Style Selector="^.Secondary">
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonSecondaryIndeterminateBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminateBorderBrush}" />
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSecondaryIndeterminateBackground}" />
+                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminateBorderBrush}" />
             </Style>
             <Style Selector="^.Tertiary">
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonTertiaryIndeterminateBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonTertiaryIndeterminateBorderBrush}" />
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonTertiaryIndeterminateBackground}" />
+                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonTertiaryIndeterminateBorderBrush}" />
             </Style>
             <Style Selector="^.Success">
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonSuccessIndeterminateBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonSuccessIndeterminateBorderBrush}" />
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSuccessIndeterminateBackground}" />
+                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSuccessIndeterminateBorderBrush}" />
             </Style>
             <Style Selector="^.Warning">
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonWarningIndeterminateBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminateBorderBrush}" />
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonWarningIndeterminateBackground}" />
+                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminateBorderBrush}" />
             </Style>
             <Style Selector="^.Danger">
-                <Setter Property="Background" Value="{DynamicResource ToggleButtonDangerIndeterminateBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminateBorderBrush}" />
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDangerIndeterminateBackground}" />
+                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminateBorderBrush}" />
             </Style>
             <Style Selector="^:pointerover">
-                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverForeground}" />
+                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverBorderBrush}" />
+                <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverForeground}" />
                 <Style Selector="^.Primary">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverBorderBrush}" />
-                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverForeground}" />
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverForeground}" />
                 </Style>
                 <Style Selector="^.Secondary">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePointeroverBorderBrush}" />
-                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePointeroverForeground}" />
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePointeroverForeground}" />
                 </Style>
                 <Style Selector="^.Tertiary">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePointeroverBorderBrush}" />
-                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePointeroverForeground}" />
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePointeroverForeground}" />
                 </Style>
                 <Style Selector="^.Success">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonSuccessIndeterminatePointeroverBorderBrush}" />
-                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonSuccessIndeterminatePointeroverForeground}" />
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSuccessIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonSuccessIndeterminatePointeroverForeground}" />
                 </Style>
                 <Style Selector="^.Warning">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminatePointeroverBorderBrush}" />
-                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonWarningIndeterminatePointeroverForeground}" />
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonWarningIndeterminatePointeroverForeground}" />
                 </Style>
                 <Style Selector="^.Danger">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminatePointeroverBorderBrush}" />
-                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDangerIndeterminatePointeroverForeground}" />
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDangerIndeterminatePointeroverForeground}" />
                 </Style>
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
+                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
+                <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
                 <Style Selector="^.Primary">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
-                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedForeground}" />
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedForeground}" />
                 </Style>
                 <Style Selector="^.Secondary">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePressedBorderBrush}" />
-                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePressedForeground}" />
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePressedBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePressedForeground}" />
                 </Style>
                 <Style Selector="^.Tertiary">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePressedBorderBrush}" />
-                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePressedForeground}" />
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePressedBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePressedForeground}" />
                 </Style>
                 <Style Selector="^.Success">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonSuccessIndeterminatePressedBorderBrush}" />
-                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonSuccessIndeterminatePressedForeground}" />
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSuccessIndeterminatePressedBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonSuccessIndeterminatePressedForeground}" />
                 </Style>
                 <Style Selector="^.Warning">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminatePressedBorderBrush}" />
-                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonWarningIndeterminatePressedForeground}" />
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminatePressedBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonWarningIndeterminatePressedForeground}" />
                 </Style>
                 <Style Selector="^.Danger">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminatePressedBorderBrush}" />
-                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDangerIndeterminatePressedForeground}" />
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminatePressedBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDangerIndeterminatePressedForeground}" />
                 </Style>
             </Style>
             <Style Selector="^:disabled">
-                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonIndeterminateDisabledBorderBrush}" />
+                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonIndeterminateDisabledBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultDisabledForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ToggleButtonDefaultDisabledBackground}" />
+            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultDisabledForeground}" />
+            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDefaultDisabledBackground}" />
         </Style>
 
         <Style Selector="^.Large">
-            <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
+            <Setter Property="ToggleButton.Padding" Value="{DynamicResource ButtonLargePadding}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
+            <Setter Property="ToggleButton.Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/ToggleSwitch.axaml

@@ -113,45 +113,45 @@
 
         <Style Selector="^:unchecked">
             <Style Selector="^ /template/ ContentPresenter#PART_OnContentPresenter">
-                <Setter Property="IsVisible" Value="False" />
+                <Setter Property="ContentPresenter.IsVisible" Value="False" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_OffContentPresenter">
-                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="ContentPresenter.IsVisible" Value="True" />
             </Style>
             <Style Selector="^ /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedDefaultBackground}" />
+                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedDefaultBackground}" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedPointeroverBackground}" />
+                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedPressedBackground}" />
+                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedPressedBackground}" />
             </Style>
             <Style Selector="^:disabled /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedDisabledBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchContainerUnCheckedDisabledBorderBrush}" />
-                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedDisabledBackground}" />
+                <Setter Property="Border.BorderBrush" Value="{DynamicResource ToggleSwitchContainerUnCheckedDisabledBorderBrush}" />
+                <Setter Property="Border.BorderThickness" Value="1" />
             </Style>
         </Style>
 
         <Style Selector="^:checked">
             <Style Selector="^ /template/ ContentPresenter#PART_OnContentPresenter">
-                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="ContentPresenter.IsVisible" Value="True" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_OffContentPresenter">
-                <Setter Property="IsVisible" Value="False" />
+                <Setter Property="ContentPresenter.IsVisible" Value="False" />
             </Style>
             <Style Selector="^ /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerCheckedDefaultBackground}" />
+                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerCheckedDefaultBackground}" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerCheckedPointeroverBackground}" />
+                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerCheckedPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerCheckedPressedBackground}" />
+                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerCheckedPressedBackground}" />
             </Style>
             <Style Selector="^:disabled /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerCheckedDisabledBackground}" />
+                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerCheckedDisabledBackground}" />
             </Style>
         </Style>
     </ControlTheme>

src/Semi.Avalonia/Controls/TreeView.axaml

@@ -41,7 +41,6 @@
                         Background="{TemplateBinding Background}"
                         HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                         IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                        IsDeferredScrollingEnabled="{TemplateBinding (ScrollViewer.IsDeferredScrollingEnabled)}"
                         VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                         <ItemsPresenter
                             Name="PART_ItemsPresenter"
@@ -86,10 +85,10 @@
         </Setter>
 
         <Style Selector="^:checked /template/ PathIcon#PART_ExpandIconPath">
-            <Setter Property="RenderTransform" Value="rotate(90deg)" />
+            <Setter Property="PathIcon.RenderTransform" Value="rotate(90deg)" />
         </Style>
         <Style Selector="^:pointerover /template/ PathIcon#PART_ExpandIconPath">
-            <Setter Property="Foreground" Value="{DynamicResource TreeViewItemIconHoverForeground}" />
+            <Setter Property="PathIcon.Foreground" Value="{DynamicResource TreeViewItemIconHoverForeground}" />
         </Style>
     </ControlTheme>
 
@@ -174,8 +173,8 @@
         </Style>
 
         <Style Selector="^:empty /template/ ToggleButton#PART_ExpandCollapseChevron">
-            <Setter Property="Opacity" Value="0" />
-            <Setter Property="IsHitTestVisible" Value="False" />
+            <Setter Property="ToggleButton.Opacity" Value="0" />
+            <Setter Property="ToggleButton.IsHitTestVisible" Value="False" />
         </Style>
 
     </ControlTheme>

src/Semi.Avalonia/Locale/en-us.axaml

@@ -1,10 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <x:String x:Key="STRING_CHOOSER_FILE_NAME">File name</x:String>
-    <x:String x:Key="STRING_CHOOSER_SHOW_HIDDEN_FILES">Show hidden flies</x:String>
-    <x:String x:Key="STRING_CHOOSER_DIALOG_OK">OK</x:String>
-    <x:String x:Key="STRING_CHOOSER_DIALOG_CANCEL">Cancel</x:String>
-    <x:String x:Key="STRING_MENU_CUT">Cut</x:String>
-    <x:String x:Key="STRING_MENU_COPY">Copy</x:String>
-    <x:String x:Key="STRING_MENU_PASTE">Paste</x:String>
-</ResourceDictionary>

src/Semi.Avalonia/Locale/zh-cn.axaml

@@ -1,10 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <x:String x:Key="STRING_CHOOSER_FILE_NAME">文件名</x:String>
-    <x:String x:Key="STRING_CHOOSER_SHOW_HIDDEN_FILES">显示隐藏文件</x:String>
-    <x:String x:Key="STRING_CHOOSER_DIALOG_OK">确认</x:String>
-    <x:String x:Key="STRING_CHOOSER_DIALOG_CANCEL">取消</x:String>
-    <x:String x:Key="STRING_MENU_CUT">剪切</x:String>
-    <x:String x:Key="STRING_MENU_COPY">复制</x:String>
-    <x:String x:Key="STRING_MENU_PASTE">粘贴</x:String>
-</ResourceDictionary>

src/Semi.Avalonia/Semi.Avalonia.csproj

@@ -4,7 +4,7 @@
 
     <PropertyGroup>
         <Title>Semi.Avalonia</Title>
-        <PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to 11.0.1</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

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

@@ -21,6 +21,7 @@
 
     <!--  Solid  -->
     <SolidColorBrush x:Key="ButtonSolidForeground" Color="White" />
+    <SolidColorBrush x:Key="ButtonSolidDisabledForeground" Color="Gray" />
 
     <SolidColorBrush x:Key="ButtonSolidPrimaryBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBackground" Color="#7FC1FF" />
@@ -46,6 +47,8 @@
     <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBackground" Color="#FD9983" />
     <SolidColorBrush x:Key="ButtonSolidDangerPressedBackground" Color="#FDBEAC" />
 
+    <SolidColorBrush x:Key="ButtonSolidDisabledBackground" Color="Gray" />
+
     <SolidColorBrush x:Key="ButtonSolidPrimaryBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBorderBrush" Color="#7FC1FF" />
     <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBorderBrush" Color="#A9D7FF" />
@@ -69,9 +72,7 @@
     <SolidColorBrush x:Key="ButtonSolidDangerBorderBrush" Color="#FC725A" />
     <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBorderBrush" Color="#FD9983" />
     <SolidColorBrush x:Key="ButtonSolidDangerPressedBorderBrush" Color="#FDBEAC" />
+
+    <SolidColorBrush x:Key="ButtonSolidDisabledBorderBrush" Color="#FF2E3238" />
     <!--  end Solid  -->
-    
-    <SolidColorBrush x:Key="ButtonInputInnerForeground" Color="#888D92" />
-    <SolidColorBrush x:Key="ButtonInputInnerPointeroverForeground" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="ButtonInputInnerPressedForeground" Color="#C6CACD" />
 </ResourceDictionary>

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

@@ -2,6 +2,7 @@
     <SolidColorBrush x:Key="ExpanderSeparatorBorderBrush" Opacity="0.08" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ExpanderHeaderDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ExpanderIconForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ExpanderHeaderDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ExpanderHeaderHoverBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="ExpanderHeaderPressedBackground" Opacity="0.16" Color="White" />

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

@@ -1,5 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- ListBox -->
+    <SolidColorBrush x:Key="ListBoxItemDefaultForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ListBoxItemIconDefaultForeground" Opacity="0.6" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ListBoxItemIconHoverForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ListBoxItemDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="Transparent" />

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

@@ -1,4 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ManagedFileChooserIconForeground" Opacity="0.65" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ManagedFileChooserTextForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ManagedFileChooserSeparatorBorderBrush" Opacity="0.08" Color="#F9F9F9" />
 </ResourceDictionary>

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

@@ -1,4 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ScrollBarButtonDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ScrollBarButtonDefaultForeground" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ScrollBarButtonPointeroverForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ScrollBarThumbForeground" Opacity="0.35" Color="#F9F9F9" />

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

@@ -8,7 +8,7 @@
     <SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="#7FC1FF" />
     <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="#A9D7FF" />
 
-    <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#FF41464C" />
+    <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#0A4694" />
     <SolidColorBrush x:Key="SliderThumbDisabledBorderBrush" Color="#0A4694" />
     <SolidColorBrush x:Key="SliderTrackDisabledBackground" Color="#1C1F23" />
 </ResourceDictionary>

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

@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Line  -->
     <SolidColorBrush x:Key="TabItemLinePipeBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TabItemLinePipeSelectedBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="TabItemLinePipePointeroverBorderBrush" Opacity="0.16" Color="White" />
@@ -8,4 +7,7 @@
     <SolidColorBrush x:Key="TabItemLineHeaderForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TabItemLineHeaderPointeroverForeground" Opacity="0.8" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TabItemLineHeaderSelectedForeground" Color="#F9F9F9" />
+
+    <SolidColorBrush x:Key="TabItemLineHeaderBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="TabItemLineHeaderPointeroverBackground" Color="Transparent" />
 </ResourceDictionary>

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

@@ -3,9 +3,9 @@
     <SolidColorBrush x:Key="TextBlockSecondaryForeground" Opacity="0.8" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TextBlockTertiaryForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TextBlockQuaternaryForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TextBlockSuccessForeground" Color="#5DC264" />
     <SolidColorBrush x:Key="TextBlockWarningForeground" Color="#FFAE43" />
     <SolidColorBrush x:Key="TextBlockDangerForeground" Color="#FC725A" />
+    <SolidColorBrush x:Key="TextBlockSuccessForeground" Color="#5DC264" />
     <SolidColorBrush x:Key="TextBlockDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.68" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TextBlockMarkBackground" Color="#053170" />

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

@@ -5,8 +5,11 @@
     <SolidColorBrush x:Key="TextBoxDefaultBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="TextBoxPointeroverBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="TextBoxPressedBackground" Opacity="0.2" Color="White" />
+    <SolidColorBrush x:Key="TextBoxFocusBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="TextBoxPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="TextBoxForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TextBoxWatermarkForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TextBoxInnerForeground" Opacity="0.6" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="TextBoxButtonDefaultForeground" Opacity="0.2" Color="#E6E8EA" />
@@ -21,6 +24,7 @@
     <SolidColorBrush x:Key="TextBoxBorderedPointeroverBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TextBoxBorderedPointeroverBorderBrush" Color="#7FC1FF" />
 
+
     <SolidColorBrush x:Key="TextBoxSelectionBackground" Color="#0059D6" />
     <SolidColorBrush x:Key="TextBoxSelectionForeground" Color="White" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Index.axaml

@@ -9,7 +9,6 @@
                 <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/_index.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Locale/zh-cn.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>

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

@@ -1,4 +1,6 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Light  -->
     <SolidColorBrush x:Key="ButtonDefaultPrimaryForeground" Color="#0077FA" />
     <SolidColorBrush x:Key="ButtonDefaultSecondaryForeground" Color="#0095EE" />
@@ -17,10 +19,12 @@
     <SolidColorBrush x:Key="ButtonDefaultPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonDefaultPressedBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonDefaultDisabledBorderBrush" Color="Transparent" />
+
     <!--  end Light  -->
 
     <!--  Solid  -->
     <SolidColorBrush x:Key="ButtonSolidForeground" Color="White" />
+    <SolidColorBrush x:Key="ButtonSolidDisabledForeground" Color="Gray" />
 
     <SolidColorBrush x:Key="ButtonSolidPrimaryBackground" Color="#0077FA" />
     <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBackground" Color="#0062D6" />
@@ -46,6 +50,8 @@
     <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBackground" Color="#D52515" />
     <SolidColorBrush x:Key="ButtonSolidDangerPressedBackground" Color="#B2140C" />
 
+    <SolidColorBrush x:Key="ButtonSolidDisabledBackground" Color="Gray" />
+
     <SolidColorBrush x:Key="ButtonSolidPrimaryBorderBrush" Color="#0077FA" />
     <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBorderBrush" Color="#004FB3" />
@@ -69,9 +75,7 @@
     <SolidColorBrush x:Key="ButtonSolidDangerBorderBrush" Color="#F93920" />
     <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBorderBrush" Color="#D52515" />
     <SolidColorBrush x:Key="ButtonSolidDangerPressedBorderBrush" Color="#B2140C" />
+
+    <SolidColorBrush x:Key="ButtonSolidDisabledBorderBrush" Color="Gray" />
     <!--  end Solid  -->
-    
-    <SolidColorBrush x:Key="ButtonInputInnerForeground" Color="#6B7075" />
-    <SolidColorBrush x:Key="ButtonInputInnerPointeroverForeground" Color="#555B61" />
-    <SolidColorBrush x:Key="ButtonInputInnerPressedForeground" Color="#41464C" />
 </ResourceDictionary>

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

@@ -2,6 +2,7 @@
     <SolidColorBrush x:Key="ExpanderSeparatorBorderBrush" Opacity="0.08" Color="#1C1F23" />
     <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ExpanderHeaderDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ExpanderIconForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="ExpanderHeaderDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ExpanderHeaderHoverBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="ExpanderHeaderPressedBackground" Opacity="0.09" Color="#2E3238" />

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

@@ -1,5 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- ListBox -->
+    <SolidColorBrush x:Key="ListBoxItemDefaultForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ListBoxItemIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ListBoxItemIconHoverForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ListBoxItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
 
     <SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="Transparent" />

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

@@ -1,4 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ManagedFileChooserIconForeground" Opacity="0.65" Color="#1C1F23" />
     <SolidColorBrush x:Key="ManagedFileChooserTextForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ManagedFileChooserSeparatorBorderBrush" Opacity="0.08" Color="#1C1F23" />
 </ResourceDictionary>

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

@@ -1,4 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ScrollBarButtonDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ScrollBarButtonDefaultForeground" Opacity="0.35" Color="#1C1F23" />
     <SolidColorBrush x:Key="ScrollBarButtonPointeroverForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="ScrollBarThumbForeground" Opacity="0.35" Color="#1C1F23" />

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

@@ -8,7 +8,7 @@
     <SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="#004FB3" />
 
-    <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#FFC6CACD" />
+    <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#CBE7FE" />
     <SolidColorBrush x:Key="SliderThumbDisabledBorderBrush" Color="#CBE7FE" />
     <SolidColorBrush x:Key="SliderTrackDisabledBackground" Color="#F9F9F9" />
 </ResourceDictionary>

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

@@ -8,4 +8,7 @@
     <SolidColorBrush x:Key="TabItemLineHeaderForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="TabItemLineHeaderPointeroverForeground" Opacity="0.8" Color="#1C1F23" />
     <SolidColorBrush x:Key="TabItemLineHeaderSelectedForeground" Color="#1C1F23" />
+
+    <SolidColorBrush x:Key="TabItemLineHeaderBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="TabItemLineHeaderPointeroverBackground" Color="Transparent" />
 </ResourceDictionary>

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

@@ -3,9 +3,9 @@
     <SolidColorBrush x:Key="TextBlockSecondaryForeground" Opacity="0.8" Color="#1C1F23" />
     <SolidColorBrush x:Key="TextBlockTertiaryForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="TextBlockQuaternaryForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBlockSuccessForeground" Color="#3BB346" />
     <SolidColorBrush x:Key="TextBlockWarningForeground" Color="#FC8800" />
     <SolidColorBrush x:Key="TextBlockDangerForeground" Color="#F93920" />
+    <SolidColorBrush x:Key="TextBlockSuccessForeground" Color="#3BB346" />
     <SolidColorBrush x:Key="TextBlockDisabledForeground" Opacity="0.35" Color="#1C1F23" />
     <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.68" Color="#1C1F23" />
     <SolidColorBrush x:Key="TextBlockMarkBackground" Color="#EAF5FF" />

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

@@ -5,8 +5,11 @@
     <SolidColorBrush x:Key="TextBoxDefaultBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="TextBoxPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
     <SolidColorBrush x:Key="TextBoxPressedBackground" Opacity="0.13" Color="#FF2E3238" />
+    <SolidColorBrush x:Key="TextBoxFocusBackground" Opacity="0.05" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="TextBoxPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="#0077FA" />
     <SolidColorBrush x:Key="TextBoxForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="TextBoxWatermarkForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="TextBoxInnerForeground" Opacity="0.62" Color="#1C1F23" />
 
     <SolidColorBrush x:Key="TextBoxButtonDefaultForeground" Opacity="0.08" Color="#FF1C1F23" />

src/Semi.Avalonia/Themes/SemiTheme.axaml

@@ -1,19 +0,0 @@
-<Styles x:Class="Semi.Avalonia.SemiTheme" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Styles.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <MergeResourceInclude x:Key="Default" Source="avares://Semi.Avalonia/Themes/Light/_index.axaml" />
-                <MergeResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia/Themes/Dark/_index.axaml" />
-            </ResourceDictionary.ThemeDictionaries>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/_index.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Locale/zh-cn.axaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-    <Style Selector=":is(UserControl)">
-        <Setter Property="Theme" Value="{DynamicResource {x:Type UserControl}}" />
-    </Style>
-</Styles>