Merge pull request #399 from irihitech/upgrade

Upgrade to 11.0.7.5

README.md

@@ -1,48 +1,32 @@
-# Semi Avalonia
+# Semi.Avalonia
 
 [![Semi Avalonia](https://img.shields.io/nuget/v/Semi.Avalonia.svg?color=red&style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
 [![Semi Avalonia](https://img.shields.io/nuget/dt/Semi.Avalonia.svg?style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
 
-[中文](./README_CN.md)
-
 Avalonia Theme inspired by Semi Design
 
-Semi.Avalonia can be previewed in the browser [here](https://irihitech.github.io/Semi.Avalonia/)
+# How to Use
-
-If you are looking for more detailed documentation, Please visit [Semi Documentation](https://docs.irihi.tech/semi/)
-
-If you are looking for more customized controls, Please try [Ursa](https://github.com/irihitech/Ursa.Avalonia)
-
-![Light](./docs/demo.jpg)
-
-## How to Use
-
-### Installation
 
+## Installation
 ```bash
 dotnet add package Semi.Avalonia
 ```
-
 Include Semi Design Styles in application:
 
 ```xaml
 <Application.Styles>
-<!-- You can still reference in old way.  -->
+    <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
-<!-- <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" /> -->
-    <semi:SemiTheme Locale="zh-cn" />
 </Application.Styles>
 ```
 
-That's all.
+That's all. 
-
-ColorPicker, DataGrid and TreeDataGrid are distributed in separated packages. Please install if you need.
 
+ColorPicker, DataGrid and TreeDataGrid are distributed in separated packages. Please install if you need. 
 ```bash
 dotnet add package Semi.Avalonia.ColorPicker
 dotnet add package Semi.Avalonia.DataGrid
 dotnet add package Semi.Avalonia.TreeDataGrid
 ```
-
 ```xaml
 <Application.Styles>
     <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
@@ -54,22 +38,18 @@ dotnet add package Semi.Avalonia.TreeDataGrid
 ## Demo
 
 You can always download demo executable to play around with Semi Avalonia Themes.
-<https://github.com/irihitech/Semi.Avalonia/releases>
+https://github.com/irihitech/Semi.Avalonia/releases
-
-## Support
-
-We offer limited free community support for Semi Avalonia and Ursa. If you have any question or suggestion, feel free to raise issues and discussions via GitHub, and you are welcomed to join our group via FeiShu(Lark)
-
-![FeiShu](./docs/community-support.png) 
 
 ## Version compatibility
 
 | Semi Design Version | Avalonia Version |
 |:--------------------|:-----------------|
-| 11.1.0              | >=11.1.0         |
+| 11.0.7              | 11.0.7           |
-| 11.0.7              | >=11.0.7         |
 | 11.0.1              | <=11.0.6         |
 
+## TODO
+* FocusAdorner
+
 ## Credits
 
 [Semi Design](https://semi.design/)
@@ -82,3 +62,10 @@ We offer limited free community support for Semi Avalonia and Ursa. If you have
 
 [CommunityToolKit](https://github.com/CommunityToolkit/dotnet)
 
+## Screenshot
+
+Light Mode
+![Light](./docs/Light.png)
+
+Dark Mode
+![Dark](./docs/Dark.png)

README_CN.md

@@ -1,86 +0,0 @@
-# Semi Avalonia
-
-[![Semi Avalonia](https://img.shields.io/nuget/v/Semi.Avalonia.svg?color=red&style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
-[![Semi Avalonia](https://img.shields.io/nuget/dt/Semi.Avalonia.svg?style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
-
-[English](./README.md)
-
-Avalonia UI 控件主题，灵感来自 Semi Design
-
-Semi.Avalonia 现在可以在浏览器上 [查看效果](https://irihitech.github.io/Semi.Avalonia/)
-
-如果您希望查看更详细的文档，请浏览 [Semi 文档](https://docs.irihi.tech/semi/)
-
-如果您希望使用更多的拓展控件，欢迎尝试 [Ursa](https://github.com/irihitech/Ursa.Avalonia)
-
-![Light](./docs/demo.jpg)
-
-## 如何使用
-
-### 安装
-
-```bash
-dotnet add package Semi.Avalonia
-```
-
-在样式中引用 Semi 主题：
-
-```xaml
-<Application.Styles>
-<!-- 您仍然可以使用旧版方式引用  -->
-<!-- <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" /> -->
-    <semi:SemiTheme Locale="zh-cn" />
-</Application.Styles>
-```
-
-这样就可以了。
-
-ColorPicker、DataGrid 和 TreeDataGrid 的样式单独分发，如果需要请安装并引用。
-
-```bash
-dotnet add package Semi.Avalonia.ColorPicker
-dotnet add package Semi.Avalonia.DataGrid
-dotnet add package Semi.Avalonia.TreeDataGrid
-```
-
-```xaml
-<Application.Styles>
-    <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
-    <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
-    <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
-</Application.Styles>
-```
-
-## 示例
-
-您可以从 Semi Avalonia 的 release 页下载并试用 Semi Avalonia 的展示应用。
-
-<https://github.com/irihitech/Semi.Avalonia/releases>
-
-## 社区支持
-
-我们提供有限度的免费社区支持，如果您有任何问题或建议，除了在GitHub上提交issue或发起讨论，也欢迎加入我们的飞书交流群：
-
-![FeiShu](./docs/community-support.png)
-
-
-## 版本兼容性
-
-| Semi Design Version | Avalonia Version |
-|:--------------------|:-----------------|
-| 11.1.0              | >=11.1.0         |
-| 11.0.7              | >=11.0.7         |
-| 11.0.1              | <=11.0.6         |
-
-## 致谢
-
-[Semi Design](https://semi.design/)
-
-[Avalonia](https://github.com/AvaloniaUI/Avalonia)
-
-[FluentAvalonia](https://github.com/amwx/FluentAvalonia)
-
-[Material Design Icons](https://pictogrammers.com/library/mdi/)
-
-[CommunityToolKit](https://github.com/CommunityToolkit/dotnet)
-

demo/Directory.Build.props

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

demo/Semi.Avalonia.Demo.Android/MainActivity.cs

@@ -1,6 +1,5 @@
 using Android.App;
 using Android.Content.PM;
-using Avalonia;
 using Avalonia.Android;
 
 namespace Semi.Avalonia.Demo.Android;
@@ -14,12 +13,4 @@ namespace Semi.Avalonia.Demo.Android;
     ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
 public class MainActivity : AvaloniaMainActivity<App>
 {
-    protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
-    {
-        return base.CustomizeAppBuilder(builder)
-            .With(new AndroidPlatformOptions()
-            {
-                RenderingMode = [AndroidRenderingMode.Vulkan, AndroidRenderingMode.Egl, AndroidRenderingMode.Software]
-            });
-    }
 }

demo/Semi.Avalonia.Demo.Android/Resources/AboutResources.txt

@@ -1,44 +0,0 @@
-Images, layout descriptions, binary blobs and string dictionaries can be included 
-in your application as resource files.  Various Android APIs are designed to 
-operate on the resource IDs instead of dealing with images, strings or binary blobs 
-directly.
-
-For example, a sample Android app that contains a user interface layout (main.axml),
-an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
-would keep its resources in the "Resources" directory of the application:
-
-Resources/
-    drawable/
-        icon.png
-
-    layout/
-        main.axml
-
-    values/
-        strings.xml
-
-In order to get the build system to recognize Android resources, set the build action to
-"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
-instead operate on resource IDs.  When you compile an Android application that uses resources, 
-the build system will package the resources for distribution and generate a class called "R" 
-(this is an Android convention) that contains the tokens for each one of the resources 
-included. For example, for the above Resources layout, this is what the R class would expose:
-
-public class R {
-    public class drawable {
-        public const int icon = 0x123;
-    }
-
-    public class layout {
-        public const int main = 0x456;
-    }
-
-    public class strings {
-        public const int first_string = 0xabc;
-        public const int second_string = 0xbcd;
-    }
-}
-
-You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main 
-to reference the layout/main.axml file, or R.strings.first_string to reference the first 
-string in the dictionary file values/strings.xml.

demo/Semi.Avalonia.Demo.Android/Resources/drawable-night-v31/avalonia_anim.xml

@@ -1,66 +0,0 @@
-<animated-vector
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:aapt="http://schemas.android.com/aapt">
-  <aapt:attr name="android:drawable">
-    <vector
-      android:name="vector"
-      android:width="128dp"
-      android:height="128dp"
-      android:viewportWidth="128"
-      android:viewportHeight="128">
-      <group
-        android:name="wrapper"
-        android:translateX="21"
-        android:translateY="21">
-        <group android:name="group">
-          <path
-            android:name="path"
-            android:pathData="M 74.853 85.823 L 75.368 85.823 C 80.735 85.823 85.144 81.803 85.761 76.602 L 85.836 41.76 C 85.225 18.593 66.254 0 42.939 0 C 19.24 0 0.028 19.212 0.028 42.912 C 0.028 66.357 18.831 85.418 42.18 85.823 L 74.853 85.823 Z"
-            android:strokeWidth="1"/>
-          <path
-            android:name="path_1"
-            android:pathData="M 43.059 14.614 C 29.551 14.614 18.256 24.082 15.445 36.743 C 18.136 37.498 20.109 39.968 20.109 42.899 C 20.109 45.831 18.136 48.301 15.445 49.055 C 18.256 61.716 29.551 71.184 43.059 71.184 C 47.975 71.184 52.599 69.93 56.628 67.723 L 56.628 70.993 L 71.344 70.993 L 71.344 44.072 C 71.357 43.714 71.344 43.26 71.344 42.899 C 71.344 27.278 58.68 14.614 43.059 14.614 Z M 29.51 42.899 C 29.51 35.416 35.576 29.35 43.059 29.35 C 50.541 29.35 56.607 35.416 56.607 42.899 C 56.607 50.382 50.541 56.448 43.059 56.448 C 35.576 56.448 29.51 50.382 29.51 42.899 Z"
-            android:strokeWidth="1"
-            android:fillType="evenOdd"/>
-          <path
-            android:name="path_2"
-            android:pathData="M 18.105 42.88 C 18.105 45.38 16.078 47.407 13.579 47.407 C 11.079 47.407 9.052 45.38 9.052 42.88 C 9.052 40.381 11.079 38.354 13.579 38.354 C 16.078 38.354 18.105 40.381 18.105 42.88 Z"
-            android:strokeWidth="1"/>
-        </group>
-      </group>
-    </vector>
-  </aapt:attr>
-  <target android:name="path">
-    <aapt:attr name="android:animation">
-      <objectAnimator
-        android:propertyName="fillColor"
-        android:duration="1000"
-        android:valueFrom="#00ffffff"
-        android:valueTo="#161c2d"
-        android:valueType="colorType"
-        android:interpolator="@android:interpolator/fast_out_slow_in"/>
-    </aapt:attr>
-  </target>
-  <target android:name="path_1">
-    <aapt:attr name="android:animation">
-      <objectAnimator
-        android:propertyName="fillColor"
-        android:duration="1000"
-        android:valueFrom="#00ffffff"
-        android:valueTo="#f9f9fb"
-        android:valueType="colorType"
-        android:interpolator="@android:interpolator/fast_out_slow_in"/>
-    </aapt:attr>
-  </target>
-  <target android:name="path_2">
-    <aapt:attr name="android:animation">
-      <objectAnimator
-        android:propertyName="fillColor"
-        android:duration="1000"
-        android:valueFrom="#00ffffff"
-        android:valueTo="#f9f9fb"
-        android:valueType="colorType"
-        android:interpolator="@android:interpolator/fast_out_slow_in"/>
-    </aapt:attr>
-  </target>
-</animated-vector>

demo/Semi.Avalonia.Demo.Android/Resources/drawable-v31/avalonia_anim.xml

@@ -1,71 +0,0 @@
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="128dp"
-            android:height="128dp"
-            android:viewportWidth="128"
-            android:viewportHeight="128">
-            <group
-                android:name="wrapper"
-                android:translateX="21"
-                android:translateY="21">
-                <group android:name="group">
-                    <path
-                        android:name="path"
-                        android:pathData="M 74.853 85.823 L 75.368 85.823 C 80.735 85.823 85.144 81.803 85.761 76.602 L 85.836 41.76 C 85.225 18.593 66.254 0 42.939 0 C 19.24 0 0.028 19.212 0.028 42.912 C 0.028 66.357 18.831 85.418 42.18 85.823 L 74.853 85.823 Z"
-                        android:fillColor="#00ffffff"
-                        android:strokeWidth="1"/>
-                    <path
-                        android:name="path_1"
-                        android:pathData="M 43.059 14.614 C 29.551 14.614 18.256 24.082 15.445 36.743 C 18.136 37.498 20.109 39.968 20.109 42.899 C 20.109 45.831 18.136 48.301 15.445 49.055 C 18.256 61.716 29.551 71.184 43.059 71.184 C 47.975 71.184 52.599 69.93 56.628 67.723 L 56.628 70.993 L 71.344 70.993 L 71.344 44.072 C 71.357 43.714 71.344 43.26 71.344 42.899 C 71.344 27.278 58.68 14.614 43.059 14.614 Z M 29.51 42.899 C 29.51 35.416 35.576 29.35 43.059 29.35 C 50.541 29.35 56.607 35.416 56.607 42.899 C 56.607 50.382 50.541 56.448 43.059 56.448 C 35.576 56.448 29.51 50.382 29.51 42.899 Z"
-                        android:fillColor="#00ffffff"
-                        android:strokeWidth="1"
-                        android:fillType="evenOdd"/>
-                    <path
-                        android:name="path_2"
-                        android:pathData="M 18.105 42.88 C 18.105 45.38 16.078 47.407 13.579 47.407 C 11.079 47.407 9.052 45.38 9.052 42.88 C 9.052 40.381 11.079 38.354 13.579 38.354 C 16.078 38.354 18.105 40.381 18.105 42.88 Z"
-                        android:fillColor="#00ffffff"
-                        android:strokeWidth="1"/>
-                </group>
-            </group>
-        </vector>
-    </aapt:attr>
-    <target android:name="path_2">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="fillColor"
-                android:startOffset="100"
-                android:duration="900"
-                android:valueFrom="#00ffffff"
-                android:valueTo="#161c2d"
-                android:valueType="colorType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-    <target android:name="path">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="fillColor"
-                android:duration="500"
-                android:valueFrom="#00ffffff"
-                android:valueTo="#f9f9fb"
-                android:valueType="colorType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-    <target android:name="path_1">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="fillColor"
-                android:startOffset="100"
-                android:duration="900"
-                android:valueFrom="#00ffffff"
-                android:valueTo="#161c2d"
-                android:valueType="colorType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-</animated-vector>

demo/Semi.Avalonia.Demo.Android/Resources/values-night/colors.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="splash_background">#212121</color>
-</resources>

demo/Semi.Avalonia.Demo.Android/Resources/values-v31/styles.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<resources>
-
-  <style name="MyTheme">
-  </style>
-
-  <style name="MyTheme.NoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
-    <item name="android:windowActionBar">false</item>
-    <item name="android:windowBackground">@null</item>
-    <item name="android:windowNoTitle">true</item>
-    <item name="android:windowSplashScreenBackground">@color/splash_background</item>
-    <item name="android:windowSplashScreenAnimatedIcon">@drawable/avalonia_anim</item>
-    <item name="android:windowSplashScreenAnimationDuration">1000</item>
-    <item name="postSplashScreenTheme">@style/MyTheme.Main</item>
-
-  </style>
-  <style name="MyTheme.Main"
-         parent ="MyTheme.NoActionBar">
-    <item name="android:windowIsTranslucent">true</item>
-  </style>
-</resources>

demo/Semi.Avalonia.Demo.Android/Resources/values/styles.xml

@@ -1,12 +1,17 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <resources>
 
   <style name="MyTheme">
   </style>
 
-  <style name="MyTheme.NoActionBar" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
+  <style name="MyTheme.NoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
     <item name="android:windowActionBar">false</item>
-    <item name="android:windowBackground">@drawable/splash_screen</item>
     <item name="android:windowNoTitle">true</item>
   </style>
+
+  <style name="MyTheme.Splash" parent ="MyTheme.NoActionBar">
+    <item name="android:windowBackground">@drawable/splash_screen</item>
+    <item name="android:windowContentOverlay">@null</item>
+  </style>
+
 </resources>

demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj

@@ -3,28 +3,23 @@
         <OutputType>Exe</OutputType>
         <TargetFramework>net8.0-android</TargetFramework>
         <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
-        <Nullable>enable</Nullable>
         <ApplicationId>com.irihitech.Semi.Avalonia</ApplicationId>
         <ApplicationVersion>1</ApplicationVersion>
         <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
         <AndroidPackageFormat>apk</AndroidPackageFormat>
-        <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+        <AndroidEnableProfiledAot>False</AndroidEnableProfiledAot>
         <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
         <RootNamespace>Semi.Avalonia.Demo.Android</RootNamespace>
     </PropertyGroup>
 
+    <Import Project="../Directory.Build.props" />
+
     <ItemGroup>
-        <AndroidResource Include="Icon.png">
+        <PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
-            <Link>Resources\drawable\Icon.png</Link>
-        </AndroidResource>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)"/>
+        <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj" />
-        <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1"/>
     </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj"/>
-    </ItemGroup>
 </Project>

demo/Semi.Avalonia.Demo.Desktop/app.manifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
   <!-- This manifest is used on Windows only.
-       Don't remove it as it might cause problems with window transparency and embedded controls.
+       Don't remove it as it might cause problems with window transparency and embeded controls.
        For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
   <assemblyIdentity version="1.0.0.0" name="Semi.Avalonia.Demo.Desktop"/>
 

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

@@ -3,7 +3,6 @@ using System.Globalization;
 using System.Linq;
 using System.Threading;
 using Avalonia;
-using Avalonia.Dialogs;
 
 namespace Semi.Avalonia.Demo.Drm;
 
@@ -29,7 +28,7 @@ class Program
         if (args.Contains("--drm"))
         {
             SilenceConsole();
-            return builder.StartLinuxDrm(args, scaling: GetScaling());
+            return builder.StartLinuxDrm(args: args, card: "/dev/dri/card1", scaling: GetScaling());
         }
 
         return builder.StartWithClassicDesktopLifetime(args);
@@ -38,9 +37,7 @@ class Program
     // 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()

demo/Semi.Avalonia.Demo.Drm/README.md

@@ -1,162 +0,0 @@
-# DRM Start Steps
-
-[中文](README_CN.md)
-
-(Ubuntu 20.04 live server linux-x64 Virtual Machine Test Success)  
-(Orange Pi Zero2 Ubuntu20.04-arm64 Test Success)
-
-[Avalonia Official Reference Document](https://docs.avaloniaui.net/docs/next/guides/platforms/rpi/running-on-raspbian-lite-via-drm)
-
-## Setup Running Environment
-
-1. Run the following commands on the Linux side
-```bash
-sudo apt update
-sudo apt upgrade
-sudo reboot
-sudo apt-get install libgbm1 libgl1-mesa-dri libegl1-mesa libinput10
-```
-
-2. Install the test tool (if a colored cube appears, the environment is installed)
-```bash
-sudo apt-get install kmscube
-sudo kmscube
-```
-
-3. [Install .NET Runtime](https://learn.microsoft.com/dotnet/core/install/linux?WT.mc_id=dotnet-35129-website)
-
-4. Add the Avalonia.LinuxFramebuffer package in NuGet
-
-```bash
-dotnet add package Avalonia.LinuxFramebuffer
-```
-
-5. Add StartLinuxDrm code
-
-```csharp
-public static int Main(string[] args)
-{
-    var builder = BuildAvaloniaApp();
-    if (args.Contains("--drm"))
-    {
-        SilenceConsole();
-        // By default, Avalonia will try to detect output card automatically.
-        // But you can specify one, for example "/dev/dri/card1".
-        return builder.StartLinuxDrm(args: args, card: null, scaling: 1.0);
-    }
-
-    return builder.StartWithClassicDesktopLifetime(args);
-}
-
-private static void SilenceConsole()
-{
-    new Thread(() =>
-        {
-            Console.CursorVisible = false;
-            while (true)
-                Console.ReadKey(true);
-        })
-        { IsBackground = true }.Start();
-}
-```
-
-6. Publish the app to Linux
-
-```bash
-dotnet publish demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj -c Release -r linux-x64 --sc -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true
-```
-
-Add the following code to the csproj file for AOT publishing
-
-```xml
-<PropertyGroup>
-    <PublishAot>true</PublishAot>
-    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
-</PropertyGroup>
-```
-
-```bash
-dotnet publish demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj -c Release -r linu-x64
-```
-
-7. Run the program
-
-```bash
-sudo ./Semi.Avalonia.Demo.Drm --drm
-```
-
-## Troubleshooting
-
-1. Error message
-
-> 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
-
-Solution:
-
-If you use the Semi release file, do not trim it, otherwise an error will occur.
-
-24.8.18 update: This issue has been fixed.
-
-2. Error message
-
-> Unhandled exception. System.TypeInitializationException: The type initializer for 'SkiaSharp.SKImageInfo' threw an exception.**
-    **--->System.DllNotFoundException: Unable to load shared library 'libSkiaSharp' or one of its dependencies.In order to help diagnose loading problems, consider setting the LD_DEBUG environment variable: liblibSkiaSharp: cannot open shared object file: No such file or directory
-    at SkiaSharp.SkiaApi.sk_colortype_get_default_8888()
-    at SkiaSharp.SKImageInfo..cctor()
-
-Solution:
-
-Linux CLI installation
-
-```bash
-sudo apt-get install -y libfontconfig1  
-```
-[Reference](https://github.com/mono/SkiaSharp/issues/509)
-
-3. Error message
-
-> Permission denied
-
-Solution:
-
-add permission
-
-```bash
-sudo chmod +x ./Semi.Avalonia.Demo.Drm
-```
-
-4. Error message
-
-> 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)
-
-Solution:
-
-The `program.cs` graphics card path is incorrect, it may not be `dev/dri/card1`, see if there are other graphics cards in the `dev/dri` directory such as `card0`.
-
-24.8.18 update: Avalonia will now automatically detect the graphics card path, so you don't need to specify the graphics card path.
-
-```csharp
-return builder.StartLinuxDrm(args: args, card: null, scaling: 1.0);
-```
-
-5. Error message
->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[])
-
-Solution:
-
-Unable to open `/dev/dri/card1`, may be the graphics card is mounted to another folder.
-
-24.8.18 update: Avalonia will now automatically detect the graphics card path, so you don't need to specify the graphics card path.
-
-```csharp
-return builder.StartLinuxDrm(args: args, card: null, scaling: 1.0);
-```

demo/Semi.Avalonia.Demo.Drm/README_CN.md

@@ -1,162 +0,0 @@
-# DRM启动步骤
-
-[English](README.md)
-
-(Ubuntu 20.04 live server linux-x64 虚拟机测试成功)  
-(Orange Pi Zero2 Ubuntu20.04-arm64 测试成功)
-
-[Avalonia 官方参考文档](https://docs.avaloniaui.net/docs/next/guides/platforms/rpi/running-on-raspbian-lite-via-drm)
-
-## 搭建运行环境
-
-1. Linux端运行命令
-```bash
-sudo apt update
-sudo apt upgrade
-sudo reboot
-sudo apt-get install libgbm1 libgl1-mesa-dri libegl1-mesa libinput10
-```
-
-2. 安装测试工具(出现一个彩色立方体说明环境安装完成)  
-```bash
-sudo apt-get install kmscube
-sudo kmscube
-```
-
-3. [安装.net运行时](https://learn.microsoft.com/dotnet/core/install/linux?WT.mc_id=dotnet-35129-website)
-
-4. NuGet里面添加Avalonia.LinuxFramebuffer包
-
-```bash
-dotnet add package Avalonia.LinuxFramebuffer
-```
-
-5. 添加StartLinuxDrm代码
-
-```csharp
-public static int Main(string[] args)
-{
-    var builder = BuildAvaloniaApp();
-    if (args.Contains("--drm"))
-    {
-        SilenceConsole();
-        // By default, Avalonia will try to detect output card automatically.
-        // But you can specify one, for example "/dev/dri/card1".
-        return builder.StartLinuxDrm(args: args, card: null, scaling: 1.0);
-    }
-
-    return builder.StartWithClassicDesktopLifetime(args);
-}
-
-private static void SilenceConsole()
-{
-    new Thread(() =>
-        {
-            Console.CursorVisible = false;
-            while (true)
-                Console.ReadKey(true);
-        })
-        { IsBackground = true }.Start();
-}
-```
-
-6. 发布程序到Linux
-
-```bash
-dotnet publish demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj -c Release -r linux-x64 --sc -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true
-```
-
-AOT发布需要在csproj文件中添加以下代码
-
-```xml
-<PropertyGroup>
-    <PublishAot>true</PublishAot>
-    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
-</PropertyGroup>
-```
-
-```bash
-dotnet publish demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj -c Release -r linu-x64
-```
-
-7. 运行程序
-
-```bash
-sudo ./Semi.Avalonia.Demo.Drm --drm
-```
-
-## 报错处理
-
-1. 报错内容
-
-> 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发布文件不要裁剪，如果裁剪会报错。
-
-24.8.18更新：现在已经修复了这个问题。
-
-2. 报错内容
-
-> Unhandled exception. System.TypeInitializationException: The type initializer for 'SkiaSharp.SKImageInfo' threw an exception.**
-    **--->System.DllNotFoundException: Unable to load shared library 'libSkiaSharp' or one of its dependencies.In order to help diagnose loading problems, consider setting the LD_DEBUG environment variable: liblibSkiaSharp: cannot open shared object file: No such file or directory
-    at SkiaSharp.SkiaApi.sk_colortype_get_default_8888()
-    at SkiaSharp.SKImageInfo..cctor()
-
-解决方法：
-
-Linux 命令行安装
-
-```bash
-sudo apt-get install -y libfontconfig1  
-```
-
-[参考网址](https://github.com/mono/SkiaSharp/issues/509)
-
-3. 报错内容
-
-> Permission denied
-
-解决方法：
-
-添加执行权限
-```bash
-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`。
-
-24.8.18更新：现在Avalonia会自动检测显卡路径，所以不需要指定显卡路径。
-
-```csharp
-return builder.StartLinuxDrm(args: args, card: null, scaling: 1.0);
-```
-
-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`，可能是显卡挂载到别的文件夹下了。
-
-24.8.18更新：现在Avalonia会自动检测显卡路径，所以不需要指定显卡路径。
-
-```csharp
-return builder.StartLinuxDrm(args: args, card: null, scaling: 1.0);
-```

demo/Semi.Avalonia.Demo.Drm/Roots.xml

@@ -1,3 +0,0 @@
-<linker>
-    <assembly fullname="Semi.Avalonia.Demo" preserve="All"/>
-</linker>

demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj

@@ -1,37 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
+  <PropertyGroup>
-        <OutputType>WinExe</OutputType>
+    <OutputType>WinExe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
-        <Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
-        <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-        <!-- Uncomment below to enable Native AOT compilation-->
+    <ApplicationManifest>app.manifest</ApplicationManifest>
-        <!--
+  </PropertyGroup>
-        <PublishAot>true</PublishAot>
-        <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
-        -->
-    </PropertyGroup>
 
-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-        <IsTrimmable>true</IsTrimmable>
-        <PublishTrimmed>true</PublishTrimmed>
-    </PropertyGroup>
 
-    <PropertyGroup>
+  <ItemGroup>
-        <ApplicationManifest>app.manifest</ApplicationManifest>
+    <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-    </PropertyGroup>
+    <!--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 Include="Avalonia.LinuxFramebuffer" Version="$(AvaloniaVersion)" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <TrimmerRootDescriptor Include="Roots.xml" />
-    </ItemGroup>
 
-    <ItemGroup>
+  <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+    <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj" />
-        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+  </ItemGroup>
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.LinuxFramebuffer" Version="$(AvaloniaVersion)" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj" />
-    </ItemGroup>
 </Project>

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

@@ -0,0 +1,77 @@
+# DRM启动步骤
+
+(Ubuntu18.04Server版本 虚拟机测试OK)  
+(Orange Pi Zero2 Ubuntu20.04-arm64 测试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
+```
+
+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)
+
+4.新建一个Avalonia项目，nuget里面添加Avalonia.LinuxFramebuffer包
+
+5.添加StartLinuxDrm代码(不知道怎么添加看Semi.Avalonia.Demo.Drm项目代码)
+
+6.发布程序到Linux(安装.net，怎么运行这些省略)
+            
+7.运行 ./Semi.Avalonia.Demo.Drm --drm
+
+## 报错处理：
+
+1. 报错内容
+
+>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发布文件不要裁剪，如果裁剪会报错
+         
+
+2. 报错内容
+>Unhandled exception. System.TypeInitializationException: The type initializer for 'SkiaSharp.SKImageInfo' threw an exception.**
+    **--->System.DllNotFoundException: Unable to load shared library 'libSkiaSharp' or one of its dependencies.In order to help diagnose loading problems, consider setting the LD_DEBUG environment variable: liblibSkiaSharp: cannot open shared object file: No such file or directory
+    at SkiaSharp.SkiaApi.sk_colortype_get_default_8888()
+    at SkiaSharp.SKImageInfo..cctor()
+
+解决方法：
+>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`，可能是显卡挂载到别的文件夹下了，待解决。

demo/Semi.Avalonia.Demo.Web/Properties/AssemblyInfo.cs

@@ -1 +0,0 @@
-[assembly: System.Runtime.Versioning.SupportedOSPlatform("browser")]

demo/Semi.Avalonia.Demo.Web/Properties/launchSettings.json

@@ -6,8 +6,8 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "https://localhost:7169;http://localhost:5235",
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}"
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/debug?browser={browserInspectUri}"
     }
   }
-}
+}

demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WebAssembly">
     <PropertyGroup>
-        <TargetFramework>net8.0-browser</TargetFramework>
         <OutputType>Exe</OutputType>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <TargetFramework>net8.0-browser</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

demo/Semi.Avalonia.Demo.Web/runtimeconfig.template.json

@@ -1,10 +1,11 @@
 {
-    "wasmHostProperties": {
+  "wasmHostProperties": {
-        "perHostConfig": [
+    "perHostConfig": [
-            {
+      {
-                "name": "browser",
+        "name": "browser",
-                "host": "browser"
+        "html-path": "index.html",
-            }
+        "Host": "browser"
-        ]
+      }
-    }
+    ]
+  }
 }

demo/Semi.Avalonia.Demo.Web/wwwroot/Logo.svg

@@ -0,0 +1,5 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.4661 34.928C30.5364 34.928 30.6052 34.928 30.6754 34.928C32.8596 34.928 34.654 33.2918 34.9053 31.1752L34.9356 16.9955C34.6872 7.56697 26.9662 0 17.4777 0C7.83263 0 0.0137329 7.8189 0.0137329 17.464C0.0137329 27.0059 7.66618 34.7631 17.1687 34.928H30.4661Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5239 5.948C12.0268 5.948 7.42967 9.80117 6.286 14.954C7.38092 15.2609 8.18385 16.2664 8.18385 17.4593C8.18385 18.6523 7.38092 19.6577 6.286 19.9647C7.42966 25.1175 12.0268 28.9706 17.5239 28.9706C19.525 28.9706 21.4068 28.4601 23.0462 27.562V28.8927H29.0352V17.9365C29.0407 17.7908 29.0352 17.6063 29.0352 17.4593C29.0352 11.1018 23.8814 5.948 17.5239 5.948ZM12.0098 17.4593C12.0098 14.414 14.4786 11.9452 17.5239 11.9452C20.5693 11.9452 23.038 14.414 23.038 17.4593C23.038 20.5047 20.5693 22.9734 17.5239 22.9734C14.4786 22.9734 12.0098 20.5047 12.0098 17.4593Z" fill="#8B44AC"/>
+<path d="M7.36841 17.4517C7.36841 18.4691 6.54368 19.2938 5.52631 19.2938C4.50894 19.2938 3.6842 18.4691 3.6842 17.4517C3.6842 16.4343 4.50894 15.6096 5.52631 15.6096C6.54368 15.6096 7.36841 16.4343 7.36841 17.4517Z" fill="#8B44AC"/>
+</svg>

demo/Semi.Avalonia.Demo.Web/wwwroot/app.css

@@ -1,58 +1,74 @@
-/* HTML styles for the splash screen */
+:root {
-.avalonia-splash {
+    --sat: env(safe-area-inset-top);
+    --sar: env(safe-area-inset-right);
+    --sab: env(safe-area-inset-bottom);
+    --sal: env(safe-area-inset-left);
+}
+
+/* HTML styles for the splash screen */
+
+.highlight {
+    color: white;
+    font-size: 2.5rem;
+    display: block;
+}
+
+.purple {
+    color: #8b44ac;
+}
+
+.icon {
+    opacity: 0.05;
+    height: 35%;
+    width: 35%;
     position: absolute;
-    height: 100%;
+    background-repeat: no-repeat;
-    width: 100%;
+    right: 0px;
-    background: white;
+    bottom: 0px;
-    font-family: 'Outfit', sans-serif;
+    margin-right: 3%;
-    justify-content: center;
+    margin-bottom: 5%;
-    align-items: center;
+    z-index: 5000;
-    display: flex;
+    background-position: right bottom;
     pointer-events: none;
 }
 
-/* Light theme styles */
+#avalonia-splash a {
-@media (prefers-color-scheme: light) {
+    color: whitesmoke;
-    .avalonia-splash {
-        background: white;
-    }
-
-    .avalonia-splash h2 {
-        color: #1b2a4e;
-    }
-
-    .avalonia-splash a {
-        color: #0D6EFD;
-    }
-}
-
-@media (prefers-color-scheme: dark) {
-    .avalonia-splash {
-        background: #1b2a4e;
-    }
-
-    .avalonia-splash h2 {
-        color: white;
-    }
-
-    .avalonia-splash a {
-        color: white;
-    }
-}
-
-.avalonia-splash h2 {
-    font-weight: 400;
-    font-size: 1.5rem;
-}
-
-.avalonia-splash a {
     text-decoration: none;
-    font-size: 2.5rem;
-    display: block;   
 }
 
-.avalonia-splash.splash-close {
+.center {
-    transition: opacity 200ms, display 200ms;
+    display: flex;
-    display: none;
+    justify-content: center;
-    opacity: 0;
+    align-items: center;
+    height: 100vh;
+}
+
+#avalonia-splash {
+    position: relative;
+    height: 100%;
+    width: 100%;
+    color: whitesmoke;
+    background: #1b2a4e;
+    font-family: 'Nunito', sans-serif;
+    background-position: center;
+    background-size: cover;
+    background-repeat: no-repeat;
+    justify-content: center;
+    align-items: center;
+}
+
+.splash-close {
+    animation: fadeout 0.25s linear forwards;
+}
+
+@keyframes fadeout {
+    0% {
+        opacity: 100%;
+    }
+
+    100% {
+        opacity: 0;
+        visibility: collapse;
+    }
 }

demo/Semi.Avalonia.Demo.Web/wwwroot/index.html

@@ -5,32 +5,26 @@
     <title>Semi.Avalonia.Demo.Web</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <base href="/" />
+    <link rel="modulepreload" href="./main.js" />
+    <link rel="modulepreload" href="./_framework/dotnet.js" />
+    <link rel="modulepreload" href="./_framework/avalonia.js" />
     <link rel="stylesheet" href="./app.css" />
 </head>
 
-<body style="margin: 0; overflow: hidden">
+<body style="margin: 0px; overflow: hidden">
-<div id="out">
+    <div id="out">
-    <div class="avalonia-splash">
+        <div id="avalonia-splash">
-        <h2>
+            <div class="center">
-            Powered by
+                <h2 class="purple">
-            <a href="https://www.avaloniaui.net/" target="_blank">
+                    Powered by
-                <svg width="266" height="52" viewBox="0 0 266 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <a class="highlight" href="https://www.avaloniaui.net/" target="_blank">Avalonia UI</a>
-                    <path d="M55.8592 47.3941C54.9035 47.3941 54.1184 47.1723 53.504 46.7285C52.9237 46.2848 52.5483 45.6875 52.3776 44.9365C52.2411 44.1856 52.3947 43.3493 52.8384 42.4277L65.9456 13.7045C66.4917 12.544 67.1403 11.7077 67.8912 11.1957C68.6421 10.6496 69.5125 10.3765 70.5024 10.3765C71.4923 10.3765 72.3627 10.6496 73.1136 11.1957C73.8645 11.7077 74.496 12.544 75.008 13.7045L88.2176 42.4277C88.6613 43.3493 88.8149 44.2027 88.6784 44.9877C88.576 45.7387 88.2347 46.336 87.6544 46.7797C87.0741 47.1893 86.3232 47.3941 85.4016 47.3941C84.2411 47.3941 83.3365 47.1211 82.688 46.5749C82.0736 46.0288 81.5275 45.1755 81.0496 44.0149L78.9279 39.0997H62.0415L59.9552 44.0149C59.4432 45.2096 58.8971 46.08 58.3168 46.6261C57.7707 47.1381 56.9515 47.3941 55.8592 47.3941ZM70.4 19.2853L64.6844 32.9045H76.2627L70.5024 19.2853H70.4Z" fill="currentColor"/>
+                </h2>
-                    <path d="M101.869 47.3941C100.879 47.3941 100.009 47.1381 99.258 46.6261C98.5071 46.08 97.9096 45.2779 97.4659 44.2197L89.7348 26.4021C89.3593 25.5147 89.2228 24.6955 89.3252 23.9445C89.4276 23.1595 89.786 22.5451 90.4004 22.1013C91.0489 21.6235 91.9364 21.3845 93.0628 21.3845C93.9844 21.3845 94.7353 21.6064 95.3156 22.0501C95.8959 22.4597 96.4079 23.2619 96.8516 24.4565L102.018 37.95L107.552 24.4053C108.03 23.2448 108.559 22.4597 109.14 22.0501C109.72 21.6064 110.522 21.3845 111.546 21.3845C112.433 21.3845 113.133 21.6235 113.645 22.1013C114.191 22.5451 114.516 23.1424 114.618 23.8933C114.755 24.6443 114.618 25.4635 114.208 26.3509L106.324 44.2197C105.88 45.312 105.283 46.1141 104.532 46.6261C103.815 47.1381 102.927 47.3941 101.869 47.3941Z" fill="currentColor"/>
+            </div>
-                    <path d="M126.569 47.4965C124.726 47.4965 123.07 47.1381 121.602 46.4213C120.135 45.7045 118.991 44.7317 118.172 43.5029C117.353 42.2741 116.943 40.8917 116.943 39.3557C116.943 37.5125 117.421 36.0619 118.377 35.0037C119.333 33.9115 120.886 33.1435 123.036 32.6997C125.186 32.2219 128.037 31.9829 131.586 31.9829H133.43V35.9765H131.638C129.897 35.9765 128.48 36.0789 127.388 36.2837C126.33 36.4544 125.562 36.7616 125.084 37.2053C124.64 37.6491 124.418 38.2635 124.418 39.0485C124.418 40.0043 124.743 40.7893 125.391 41.4037C126.074 42.0181 127.047 42.3253 128.31 42.3253C129.299 42.3253 130.17 42.1035 130.921 41.6597C131.706 41.1819 132.32 40.5504 132.764 39.7653C133.208 38.9461 133.43 38.0245 133.43 37.0005V31.1125C133.43 29.6107 133.088 28.5525 132.406 27.9381C131.723 27.2896 130.562 26.9653 128.924 26.9653C128.002 26.9653 126.995 27.0848 125.903 27.3237C124.845 27.5285 123.667 27.8869 122.37 28.3989C121.619 28.7403 120.954 28.8256 120.374 28.6549C119.793 28.4501 119.35 28.1088 119.042 27.6309C118.735 27.1189 118.582 26.5728 118.582 25.9925C118.582 25.3781 118.752 24.7979 119.094 24.2517C119.435 23.6715 119.998 23.2448 120.783 22.9717C122.387 22.3232 123.889 21.8795 125.289 21.6405C126.722 21.4016 128.037 21.2821 129.231 21.2821C131.859 21.2821 134.01 21.6747 135.682 22.4597C137.389 23.2107 138.669 24.3883 139.522 25.9925C140.376 27.5627 140.802 29.5936 140.802 32.0853V43.4517C140.802 44.7147 140.495 45.6875 139.881 46.3701C139.266 47.0528 138.379 47.3941 137.218 47.3941C136.058 47.3941 135.153 47.0528 134.505 46.3701C133.89 45.6875 133.583 44.7147 133.583 43.4517L133.594 43.15C133.594 43.15 133.293 44.032 132.61 44.8853C131.962 45.7045 131.126 46.3531 130.102 46.8309C129.078 47.2747 127.9 47.4965 126.569 47.4965Z" fill="currentColor"/>
+            <img class="icon" src="Logo.svg" alt="Avalonia Logo" />
-                    <path d="M155.632 47.4965C152.594 47.4965 150.324 46.6603 148.822 44.9877C147.321 43.2811 146.57 40.7552 146.57 37.4101V14.3189C146.57 13.0219 146.894 12.0491 147.542 11.4005C148.225 10.7179 149.198 10.3765 150.461 10.3765C151.69 10.3765 152.628 10.7179 153.277 11.4005C153.959 12.0491 154.301 13.0219 154.301 14.3189V37.1029C154.301 38.5024 154.591 39.5435 155.171 40.2261C155.786 40.8747 156.588 41.1989 157.578 41.1989C157.851 41.1989 158.107 41.1819 158.346 41.1477C158.585 41.1136 158.841 41.0965 159.114 41.0965C159.66 41.0283 160.035 41.1989 160.24 41.6085C160.479 41.984 160.598 42.752 160.598 43.9125C160.598 44.9365 160.394 45.7216 159.984 46.2677C159.574 46.7797 158.943 47.1211 158.09 47.2917C157.748 47.3259 157.356 47.36 156.912 47.3941C156.468 47.4624 156.042 47.4965 155.632 47.4965Z" fill="currentColor"/>
+        </div>
-                    <path d="M175.453 47.4965C172.756 47.4965 170.401 46.9675 168.387 45.9093C166.407 44.8512 164.871 43.3323 163.779 41.3525C162.687 39.3728 162.141 37.0347 162.141 34.3381C162.141 32.3243 162.448 30.5152 163.062 28.9109C163.677 27.3067 164.564 25.9413 165.725 24.8149C166.919 23.6544 168.336 22.784 169.974 22.2037C171.613 21.5893 173.439 21.2821 175.453 21.2821C178.149 21.2821 180.487 21.8112 182.467 22.8693C184.481 23.9275 186.034 25.4293 187.126 27.3749C188.253 29.3205 188.816 31.6416 188.816 34.3381C188.816 36.3861 188.492 38.2123 187.843 39.8165C187.229 41.4208 186.341 42.8032 185.181 43.9637C184.02 45.1243 182.604 46.0117 180.931 46.6261C179.293 47.2064 177.467 47.4965 175.453 47.4965ZM175.453 41.7109C176.579 41.7109 177.552 41.4379 178.371 40.8917C179.19 40.3456 179.839 39.5435 180.317 38.4853C180.795 37.3931 181.034 36.0107 181.034 34.3381C181.034 31.8464 180.522 30.0203 179.498 28.8597C178.474 27.6651 177.125 27.0677 175.453 27.0677C174.361 27.0677 173.388 27.3237 172.534 27.8357C171.715 28.3477 171.067 29.1499 170.589 30.2421C170.145 31.3003 169.923 32.6656 169.923 34.3381C169.923 36.8299 170.435 38.6901 171.459 39.9189C172.483 41.1136 173.814 41.7109 175.453 41.7109Z" fill="currentColor"/>
-                    <path d="M197.411 47.3941C196.148 47.3941 195.175 47.0528 194.492 46.3701C193.844 45.6875 193.52 44.7147 193.52 43.4517V25.2757C193.52 24.0128 193.844 23.0571 194.492 22.4085C195.175 21.7259 196.114 21.3845 197.308 21.3845C198.537 21.3845 199.476 21.7259 200.124 22.4085C200.773 23.0571 201.112 24.1871 201.112 25.45C201.141 25.3955 202.48 23.552 204.016 22.6645C205.586 21.7429 207.361 21.2821 209.34 21.2821C211.354 21.2821 213.01 21.6747 214.307 22.4597C215.604 23.2107 216.577 24.3712 217.225 25.9413C217.874 27.4773 218.198 29.44 218.198 31.8293V43.4517C218.198 44.7147 217.857 45.6875 217.174 46.3701C216.525 47.0528 215.57 47.3941 214.307 47.3941C213.078 47.3941 212.122 47.0528 211.44 46.3701C210.791 45.6875 210.467 44.7147 210.467 43.4517V32.1877C210.467 30.4469 210.143 29.2011 209.494 28.4501C208.88 27.6651 207.924 27.2725 206.627 27.2725C204.988 27.2725 203.674 27.7845 202.684 28.8085C201.729 29.8325 201.251 31.1979 201.251 32.9045V43.4517C201.251 46.08 199.971 47.3941 197.411 47.3941Z" fill="currentColor"/>
-                    <path d="M227.861 47.3429C226.598 47.3429 225.625 46.9845 224.942 46.2677C224.294 45.5168 223.97 44.4757 223.97 43.1445V25.6341C223.97 24.2688 224.294 23.2277 224.942 22.5109C225.625 21.76 226.598 21.3845 227.861 21.3845C229.09 21.3845 230.028 21.76 230.677 22.5109C231.359 23.2277 231.701 24.2688 231.701 25.6341V43.1445C231.701 44.4757 231.377 45.5168 230.728 46.2677C230.079 46.9845 229.124 47.3429 227.861 47.3429ZM227.861 17.1861C226.427 17.1861 225.318 16.8619 224.533 16.2133C223.782 15.5307 223.406 14.5749 223.406 13.3461C223.406 12.0832 223.782 11.1275 224.533 10.4789C225.318 9.79629 226.427 9.45496 227.861 9.45496C229.294 9.45496 230.387 9.79629 231.138 10.4789C231.889 11.1275 232.264 12.0832 232.264 13.3461C232.264 14.5749 231.889 15.5307 231.138 16.2133C230.387 16.8619 229.294 17.1861 227.861 17.1861Z" fill="currentColor"/>
-                    <path d="M246.169 47.4965C244.326 47.4965 242.67 47.1381 241.202 46.4213C239.735 45.7045 238.591 44.7317 237.772 43.5029C236.953 42.2741 236.543 40.8917 236.543 39.3557C236.543 37.5125 237.021 36.0619 237.977 35.0037C238.933 33.9115 240.486 33.1435 242.636 32.6997C244.786 32.2219 247.637 31.9829 251.186 31.9829H253.03V35.9765H251.238C249.497 35.9765 248.08 36.0789 246.988 36.2837C245.93 36.4544 245.162 36.7616 244.684 37.2053C244.24 37.6491 244.018 38.2635 244.018 39.0485C244.018 40.0043 244.343 40.7893 244.991 41.4037C245.674 42.0181 246.647 42.3253 247.91 42.3253C248.899 42.3253 249.77 42.1035 250.521 41.6597C251.306 41.1819 251.92 40.5504 252.364 39.7653C252.808 38.9461 253.03 38.0245 253.03 37.0005V31.1125C253.03 29.6107 252.688 28.5525 252.006 27.9381C251.323 27.2896 250.162 26.9653 248.524 26.9653C247.602 26.9653 246.595 27.0848 245.503 27.3237C244.445 27.5285 243.267 27.8869 241.97 28.3989C241.219 28.7403 240.554 28.8256 239.974 28.6549C239.393 28.4501 238.95 28.1088 238.642 27.6309C238.335 27.1189 238.182 26.5728 238.182 25.9925C238.182 25.3781 238.352 24.7979 238.694 24.2517C239.035 23.6715 239.598 23.2448 240.383 22.9717C241.987 22.3232 243.489 21.8795 244.889 21.6405C246.322 21.4016 247.637 21.2821 248.831 21.2821C251.459 21.2821 253.61 21.6747 255.282 22.4597C256.989 23.2107 258.269 24.3883 259.122 25.9925C259.976 27.5627 260.402 29.5936 260.402 32.0853V43.4517C260.402 44.7147 260.095 45.6875 259.481 46.3701C258.866 47.0528 257.979 47.3941 256.818 47.3941C255.658 47.3941 254.753 47.0528 254.105 46.3701C253.49 45.6875 253.183 44.7147 253.183 43.4517V43.1789C253.183 43.3144 252.893 44.032 252.21 44.8853C251.562 45.7045 250.726 46.3531 249.702 46.8309C248.678 47.2747 247.5 47.4965 246.169 47.4965Z" fill="currentColor"/>
-                    <path d="M22.3444 20.9916C18.7895 20.9916 15.9077 24.0073 15.9077 27.7274C15.9077 31.4475 18.7895 34.4632 22.3444 34.4632C25.8993 34.4632 28.7811 31.4475 28.7811 27.7274C28.7811 24.0073 25.8993 20.9916 22.3444 20.9916Z" fill="currentColor"/>
-                    <path fill-rule="evenodd" clip-rule="evenodd" d="M37.6937 49.0667H21.9271C10.8346 48.8653 1.90173 39.3893 1.90173 27.7333C1.90173 15.9513 11.0289 6.40002 22.2878 6.40002C33.3638 6.40002 42.3768 15.6435 42.6667 27.161L42.6314 44.4824C42.338 47.0679 40.2434 49.0667 37.6937 49.0667ZM9.22617 24.667C10.5612 18.3725 15.9275 13.6656 22.3444 13.6656C29.7657 13.6656 35.7818 19.9613 35.7818 27.7274C35.7818 27.7857 35.7825 27.8488 35.7831 27.9136C35.7846 28.0483 35.7861 28.1901 35.7818 28.3103V41.6939H28.7907V40.0685C26.877 41.1655 24.6803 41.7892 22.3444 41.7892C15.9275 41.7892 10.5612 37.0823 9.22617 30.7878C10.5043 30.4129 11.4416 29.1847 11.4416 27.7274C11.4416 26.2701 10.5043 25.0419 9.22617 24.667ZM8.33937 29.9683C9.52696 29.9683 10.4897 28.9609 10.4897 27.7181C10.4897 26.4753 9.52696 25.4678 8.33937 25.4678C7.15178 25.4678 6.18904 26.4753 6.18904 27.7181C6.18904 28.9609 7.15178 29.9683 8.33937 29.9683Z" fill="currentColor"/>
-                </svg>
-            </a>
-        </h2>
     </div>
-</div>
+    <script type='module' src="./main.js"></script>
-<script type='module' src="./main.js"></script>
 </body>
 
-</html>
+</html>

demo/Semi.Avalonia.Demo.Web/wwwroot/main.js

@@ -10,4 +10,4 @@ const dotnetRuntime = await dotnet
 
 const config = dotnetRuntime.getConfig();
 
-await dotnetRuntime.runMain(config.mainAssemblyName, [globalThis.location.href]);
+await dotnetRuntime.runMain(config.mainAssemblyName, [window.location.search]);

demo/Semi.Avalonia.Demo/App.axaml

@@ -4,9 +4,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:semi="https://irihi.tech/semi">
     <Application.Styles>
-        <!-- You can still reference in old way.  -->
+        <!-- You can still reference in old way. 
-        <!-- <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" /> -->
+        <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
-        <semi:SemiTheme Locale="zh-cn" />
+         -->
+        <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/App.axaml.cs

@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
 using Semi.Avalonia.Demo.Views;
 
@@ -18,9 +17,6 @@ public partial class App : Application
         switch (ApplicationLifetime)
         {
             case IClassicDesktopStyleApplicationLifetime desktop:
-                // Line below is needed to remove Avalonia data validation.
-                // Without this line you will get duplicate validations from both Avalonia and CT
-                BindingPlugins.DataValidators.RemoveAt(0);
                 desktop.MainWindow = new MainWindow();
                 break;
             case ISingleViewApplicationLifetime singleView:

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

@@ -45,7 +45,7 @@
                                     <DataGridTextColumn
                                         Width="*"
                                         x:DataType="viewModels:ColorItemViewModel"
-                                        Binding="{Binding ColorDisplayName}"
+                                        Binding="{ReflectionBinding ColorDisplayName}"
                                         CanUserSort="False"
                                         Header="Name" />
                                     <DataGridTemplateColumn Width="100" Header="Hex">
@@ -99,7 +99,7 @@
                                     <DataGridTextColumn
                                         Width="*"
                                         x:DataType="viewModels:ColorItemViewModel"
-                                        Binding="{Binding ColorDisplayName}"
+                                        Binding="{ReflectionBinding ColorDisplayName}"
                                         CanUserSort="False"
                                         Header="Name" />
                                     <DataGridTemplateColumn Width="100" Header="Hex">

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

@@ -17,72 +17,58 @@
         <StackPanel.Styles>
             <Style Selector="AutoCompleteBox">
                 <Setter Property="Width" Value="300" />
-                <Setter Property="ItemsSource">
-                    <Binding Path="States" />
-                </Setter>
-                <Setter Property="ItemTemplate">
-                    <DataTemplate DataType="local:StateData">
-                        <TextBlock Text="{Binding Name}" />
-                    </DataTemplate>
-                </Setter>
             </Style>
         </StackPanel.Styles>
-
         <AutoCompleteBox
-            Watermark="Please select a State"
+            ItemsSource="{Binding States}"
-            ValueMemberBinding="{Binding Name}" />
+            ValueMemberBinding="{Binding Name}"
+            Watermark="Please select a State">
+            <AutoCompleteBox.ItemTemplate>
+                <DataTemplate DataType="local:StateData">
+                    <TextBlock Text="{Binding Name}" />
+                </DataTemplate>
+            </AutoCompleteBox.ItemTemplate>
+        </AutoCompleteBox>
         <AutoCompleteBox
             Classes="Large"
-            ValueMemberBinding="{ReflectionBinding Name}" />
+            ItemsSource="{Binding States}"
+            ValueMemberBinding="{ReflectionBinding Name}">
+            <AutoCompleteBox.ItemTemplate>
+                <DataTemplate DataType="local:StateData">
+                    <TextBlock Text="{Binding Name}" />
+                </DataTemplate>
+            </AutoCompleteBox.ItemTemplate>
+        </AutoCompleteBox>
         <AutoCompleteBox
             Classes="Small"
-            ValueMemberBinding="{ReflectionBinding Name}" />
+            ItemsSource="{Binding States}"
+            ValueMemberBinding="{ReflectionBinding Name}">
+            <AutoCompleteBox.ItemTemplate>
+                <DataTemplate DataType="local:StateData">
+                    <TextBlock Text="{Binding Name}" />
+                </DataTemplate>
+            </AutoCompleteBox.ItemTemplate>
+        </AutoCompleteBox>
         <AutoCompleteBox
             Classes="Bordered"
-            ValueMemberBinding="{ReflectionBinding Name}" />
+            ItemsSource="{Binding States}"
+            ValueMemberBinding="{ReflectionBinding Name}">
+            <AutoCompleteBox.ItemTemplate>
+                <DataTemplate DataType="local:StateData">
+                    <TextBlock Text="{Binding Name}" />
+                </DataTemplate>
+            </AutoCompleteBox.ItemTemplate>
+        </AutoCompleteBox>
         <AutoCompleteBox
             IsEnabled="False"
-            Watermark="Disabled"
+            ItemsSource="{Binding States}"
-            ValueMemberBinding="{ReflectionBinding Name}" />
+            ValueMemberBinding="{ReflectionBinding Name}"
-        <AutoCompleteBox
+            Watermark="Disabled">
-            InnerLeftContent="https://"
+            <AutoCompleteBox.ItemTemplate>
-            InnerRightContent=".com"
+                <DataTemplate DataType="local:StateData">
-            ValueMemberBinding="{ReflectionBinding Name}" />
+                    <TextBlock Text="{Binding Name}" />
-
+                </DataTemplate>
-        <StackPanel Orientation="Horizontal">
+            </AutoCompleteBox.ItemTemplate>
-            <AutoCompleteBox
+        </AutoCompleteBox>
-                Width="100"
-                Classes="Large"
-                Watermark="Large"
-                ValueMemberBinding="{ReflectionBinding Name}" />
-            <AutoCompleteBox
-                Width="100"
-                Watermark="Default"
-                ValueMemberBinding="{ReflectionBinding Name}" />
-            <AutoCompleteBox
-                Width="100"
-                Classes="Small"
-                Watermark="Small"
-                ValueMemberBinding="{ReflectionBinding Name}" />
-        </StackPanel>
-
-        <StackPanel Orientation="Horizontal">
-            <AutoCompleteBox
-                Width="100"
-                IsEnabled="False"
-                Watermark="Disabled"
-                ValueMemberBinding="{ReflectionBinding Name}" />
-            <AutoCompleteBox
-                Width="100"
-                Classes="Bordered"
-                Watermark="Bordered"
-                ValueMemberBinding="{ReflectionBinding Name}" />
-            <AutoCompleteBox
-                Width="100"
-                Classes="Bordered"
-                IsEnabled="False"
-                ValueMemberBinding="{ReflectionBinding Name}" />
-        </StackPanel>
-
     </StackPanel>
-</UserControl>
+</UserControl>

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

@@ -8,22 +8,11 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <StackPanel Orientation="Horizontal">
+        <CalendarDatePicker />
-            <CalendarDatePicker Classes="Large" />
-            <CalendarDatePicker />
-            <CalendarDatePicker Classes="Small" />
-        </StackPanel>
-
-        <StackPanel Orientation="Horizontal">
-            <CalendarDatePicker IsEnabled="False" />
-            <CalendarDatePicker Classes="Bordered" />
-            <CalendarDatePicker Classes="Bordered" IsEnabled="False" />
-        </StackPanel>
-
-        <CalendarDatePicker Width="500" />
-
         <CalendarDatePicker Classes="ClearButton" Width="200" />
-
+        <CalendarDatePicker Width="500" />
+        <CalendarDatePicker Classes="Large" />
+        <CalendarDatePicker Classes="Small" />
         <CalendarDatePicker
             Name="DatePicker2"
             Margin="0,0,0,8"
@@ -34,5 +23,9 @@
             CustomDateFormatString="ddd, MMM d"
             SelectedDateFormat="Custom" />
         <CalendarDatePicker Margin="0,0,0,8" Watermark="Watermark" />
+
+        <CalendarDatePicker IsEnabled="False" />
+        <CalendarDatePicker Classes="Bordered" />
+        <CalendarDatePicker Classes="Bordered" IsEnabled="False" />
     </StackPanel>
-</UserControl>
+</UserControl>

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

@@ -6,56 +6,29 @@
     xmlns:controls="using:Avalonia.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="1450"
+    d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <ScrollViewer>
+    <StackPanel Spacing="20">
-        <StackPanel Spacing="20">
+        <StackPanel
-            <StackPanel
+            VerticalAlignment="Top"
-                VerticalAlignment="Top"
+            Orientation="Horizontal"
-                Orientation="Horizontal"
+            Spacing="20">
-                Spacing="20">
+            <ColorView ColorSpectrumShape="Ring" />
-                <ColorView Name="Test" ColorSpectrumShape="Ring" />
+            <ColorView ColorSpectrumShape="Box" />
-                <ColorView ColorSpectrumShape="Box" />
+            <ColorView Palette="{DynamicResource SemiColorPalette}" />
-                <ColorView Palette="{DynamicResource SemiColorPalette}" />
-            </StackPanel>
-            <StackPanel
-                VerticalAlignment="Top"
-                Orientation="Horizontal">
-                <ColorView
-                    Name="SimpleColorViewTest"
-                    Theme="{StaticResource SimpleColorView}"
-                    IsAlphaVisible="True"
-                    HsvColor="hsv(120,11%,10%)" />
-                <StackPanel>
-                    <TextBlock Text="{Binding #SimpleColorViewTest.HsvColor}" />
-                    <TextBlock Text="{Binding #SimpleColorViewTest.Color}" />
-                </StackPanel>
-            </StackPanel>
-            <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
-                <ColorPicker ColorSpectrumShape="Ring">
-                    <ColorPicker.Palette>
-                        <controls:FlatHalfColorPalette />
-                    </ColorPicker.Palette>
-                </ColorPicker>
-                <ColorPicker ColorSpectrumShape="Box">
-                    <ColorPicker.Palette>
-                        <colorPicker:SemiColorLightPalette />
-                    </ColorPicker.Palette>
-                </ColorPicker>
-
-                <ColorPicker ColorSpectrumShape="Box" Theme="{DynamicResource HexColorPicker}">
-                    <ColorPicker.Palette>
-                        <colorPicker:SemiColorLightPalette />
-                    </ColorPicker.Palette>
-                </ColorPicker>
-            </StackPanel>
-            <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
-                <ColorPicker Theme="{StaticResource SimpleColorPicker}"
-                             HsvColor="hsv(120,11%,10%)" />
-                <ColorPicker Theme="{StaticResource HexSimpleColorPicker}"
-                             HsvColor="hsv(120,11%,10%)" />
-            </StackPanel>
         </StackPanel>
-    </ScrollViewer>
+        <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
-</UserControl>
+            <ColorPicker ColorSpectrumShape="Ring">
+                <ColorPicker.Palette>
+                    <controls:FlatHalfColorPalette />
+                </ColorPicker.Palette>
+            </ColorPicker>
+            <ColorPicker ColorSpectrumShape="Box">
+                <ColorPicker.Palette>
+                    <colorPicker:SemiColorLightPalette />
+                </ColorPicker.Palette>
+            </ColorPicker>
+        </StackPanel>
+    </StackPanel>
+</UserControl>

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

@@ -4,40 +4,71 @@
     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:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
+    d:DesignHeight="450"
-    d:DesignHeight="800"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <Design.DataContext>
-        <pages:ComboBoxDemoViewModel />
-    </Design.DataContext>
     <StackPanel Spacing="20">
-        <StackPanel.Styles>
+        <ComboBox Width="150">
-            <Style Selector="ComboBox">
+            <ComboBoxItem>Ding</ComboBoxItem>
-                <Setter Property="Width" Value="300" />
+            <ComboBoxItem>Otter</ComboBoxItem>
-                <Setter Property="ItemsSource" Value="{Binding Items}" />
+            <ComboBoxItem>Husky</ComboBoxItem>
-            </Style>
+            <ComboBoxItem>Mr. 17</ComboBoxItem>
-        </StackPanel.Styles>
+            <ComboBoxItem>Cass</ComboBoxItem>
-
+        </ComboBox>
-        <ComboBox />
+        <ComboBox Width="150" Classes="ClearButton">
-        <ComboBox Classes="ClearButton" />
+            <ComboBoxItem>Ding</ComboBoxItem>
-        <ComboBox PlaceholderText="Please Select" />
+            <ComboBoxItem>Otter</ComboBoxItem>
-        <ComboBox IsEnabled="False" />
+            <ComboBoxItem>Husky</ComboBoxItem>
-        <ComboBox Classes="Large" IsEnabled="False" />
+            <ComboBoxItem>Mr. 17</ComboBoxItem>
-        <ComboBox Classes="Small" />
+            <ComboBoxItem>Cass</ComboBoxItem>
-        <ComboBox Classes="Bordered" />
+        </ComboBox>
-        <ComboBox Classes="Bordered" IsEnabled="False" />
+        <ComboBox Width="150" PlaceholderText="Please Select">
-
+            <ComboBoxItem>Ding</ComboBoxItem>
-        <StackPanel Orientation="Horizontal">
+            <ComboBoxItem>Otter</ComboBoxItem>
-            <ComboBox Width="100" Classes="Large" PlaceholderText="Large" />
+            <ComboBoxItem>Husky</ComboBoxItem>
-            <ComboBox Width="100" PlaceholderText="Default" />
+            <ComboBoxItem>Mr. 17</ComboBoxItem>
-            <ComboBox Width="100" Classes="Small" PlaceholderText="Small" />
+            <ComboBoxItem>Cass</ComboBoxItem>
-        </StackPanel>
+        </ComboBox>
-
+        <ComboBox Width="150" IsEnabled="False">
-        <StackPanel Orientation="Horizontal">
+            <ComboBoxItem>Ding</ComboBoxItem>
-            <ComboBox Width="100" IsEnabled="False" PlaceholderText="Disabled" />
+            <ComboBoxItem>Otter</ComboBoxItem>
-            <ComboBox Width="100" Classes="Bordered" PlaceholderText="Bordered" />
+            <ComboBoxItem>Husky</ComboBoxItem>
-            <ComboBox Width="100" Classes="Bordered" IsEnabled="False" />
+            <ComboBoxItem>Mr. 17</ComboBoxItem>
-        </StackPanel>
+            <ComboBoxItem>Cass</ComboBoxItem>
+        </ComboBox>
+        <ComboBox
+            Width="150"
+            Classes="Large"
+            IsEnabled="False">
+            <ComboBoxItem>Ding</ComboBoxItem>
+            <ComboBoxItem>Otter</ComboBoxItem>
+            <ComboBoxItem>Husky</ComboBoxItem>
+            <ComboBoxItem>Mr. 17</ComboBoxItem>
+            <ComboBoxItem>Cass</ComboBoxItem>
+        </ComboBox>
+        <ComboBox Width="150" Classes="Small">
+            <ComboBoxItem>Ding</ComboBoxItem>
+            <ComboBoxItem>Otter</ComboBoxItem>
+            <ComboBoxItem>Husky</ComboBoxItem>
+            <ComboBoxItem>Mr. 17</ComboBoxItem>
+            <ComboBoxItem>Cass</ComboBoxItem>
+        </ComboBox>
+        <ComboBox Width="150" Classes="Bordered">
+            <ComboBoxItem>Ding</ComboBoxItem>
+            <ComboBoxItem>Otter</ComboBoxItem>
+            <ComboBoxItem>Husky</ComboBoxItem>
+            <ComboBoxItem>Mr. 17</ComboBoxItem>
+            <ComboBoxItem>Cass</ComboBoxItem>
+        </ComboBox>
+        <ComboBox
+            Width="150"
+            Classes="Bordered"
+            IsEnabled="False">
+            <ComboBoxItem>Ding</ComboBoxItem>
+            <ComboBoxItem>Otter</ComboBoxItem>
+            <ComboBoxItem>Husky</ComboBoxItem>
+            <ComboBoxItem>Mr. 17</ComboBoxItem>
+            <ComboBoxItem>Cass</ComboBoxItem>
+        </ComboBox>
     </StackPanel>
 </UserControl>

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

@@ -1,6 +1,6 @@
-using System.Collections.ObjectModel;
+using Avalonia;
 using Avalonia.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
+using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -9,11 +9,5 @@ public partial class ComboBoxDemo : UserControl
     public ComboBoxDemo()
     {
         InitializeComponent();
-        this.DataContext = new ComboBoxDemoViewModel();
     }
-}
-
-public class ComboBoxDemoViewModel : ObservableObject
-{
-    public ObservableCollection<string> Items { get; set; } = ["Ding", "Otter", "Husky", "Mr.17", "Cass"];
 }

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

@@ -14,10 +14,7 @@
     <TabControl>
         <TabItem Header="DataGrid">
            <Grid RowDefinitions="Auto, *">
-               <StackPanel Grid.Row="0" Orientation="Horizontal">
+               <ToggleSwitch Grid.Row="0" Content="Disable" Name="DisableToggle"></ToggleSwitch>
-                   <ToggleSwitch Content="Disable" Name="DisableToggle" />
-                   <ToggleSwitch Content="ScrollViewerHide" Name="ScrollViewerHide" />
-               </StackPanel>
                <DataGrid Grid.Row="1"
                          Margin="8"
                          CanUserReorderColumns="True"
@@ -25,7 +22,6 @@
                          CanUserSortColumns="True"
                          HeadersVisibility="All"
                          IsReadOnly="True"
-                         ScrollViewer.AllowAutoHide="{Binding #ScrollViewerHide.IsChecked}"
                          IsEnabled="{Binding #DisableToggle.IsChecked}"
                          ItemsSource="{Binding GridData1}">
                    <DataGrid.Columns>

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

@@ -14,16 +14,5 @@
         <DatePicker IsEnabled="False" />
         <DatePicker Classes="Large" />
         <DatePicker Classes="Small" />
-        <StackPanel Orientation="Horizontal">
-            <DatePicker Classes="Large" />
-            <DatePicker />
-            <DatePicker Classes="Small" />
-        </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <DatePicker IsEnabled="False" />
-            <DatePicker Classes="Bordered" />
-            <DatePicker Classes="Bordered" IsEnabled="False" />
-        </StackPanel>
-
     </StackPanel>
 </UserControl>

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

@@ -36,4 +36,4 @@
             </Expander>
         </Grid>
     </StackPanel>
-</UserControl>
+</UserControl>

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

@@ -10,7 +10,6 @@
     <UserControl.Styles>
         <Style Selector="Button">
             <Setter Property="Margin" Value="8" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
     </UserControl.Styles>
     <Grid

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

@@ -1,43 +0,0 @@
-<UserControl
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d"
-    x:Class="Semi.Avalonia.Demo.Pages.HyperlinkButtonDemo"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <StackPanel Orientation="Horizontal">
-            <HyperlinkButton Height="20" NavigateUri="http://www.irihi.tech/">
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    Text="iRihi Homepage"
-                    TextDecorations="Underline"
-                    VerticalAlignment="Center" />
-            </HyperlinkButton>
-        </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <HyperlinkButton Height="20" IsEnabled="False">
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    Text="Not Enabled"
-                    TextDecorations="Underline"
-                    VerticalAlignment="Center" />
-            </HyperlinkButton>
-        </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <HyperlinkButton
-                BorderThickness="1"
-                Classes="WithIcon"
-                Height="20"
-                NavigateUri="http://www.irihi.tech/">
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    Text="Link with Icon"
-                    TextDecorations="Underline"
-                    VerticalAlignment="Center" />
-            </HyperlinkButton>
-        </StackPanel>
-    </StackPanel>
-</UserControl>

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

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

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

@@ -8,11 +8,6 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <StackPanel HorizontalAlignment="Left" Spacing="10">
-        <StackPanel.Styles>
-            <Style Selector="Button">
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
-            </Style>
-        </StackPanel.Styles>
         <Button Name="openFileDialog">Open File</Button>
         <Button Name="selectFolderDialog">Select Folder</Button>
         <Button Name="saveFileDialog">Save File</Button>

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

@@ -25,30 +25,14 @@
                         <MenuItem Header="Submenu Level 2" />
                     </MenuItem>
                 </MenuItem>
-                <MenuItem Header="Menu Item with _Icon">
+                <MenuItem Header="Menu Item with _Checkbox">
                     <MenuItem.Icon>
                         <TextBlock>😊</TextBlock>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Header="Menu Item with _Checkbox" ToggleType="CheckBox" />
             </MenuItem>
             <MenuItem Header="_Second">
                 <MenuItem Header="Second _Menu Item" />
-                <MenuItem IsChecked="True" Header="Second Menu toggle item" ToggleType="CheckBox" />
-                <Separator />
-                <MenuItem GroupName="A" Header="Radio 1 - group" ToggleType="Radio" />
-                <MenuItem IsChecked="True" GroupName="A" Header="Radio 2 - group" ToggleType="Radio" />
-                <MenuItem GroupName="A" Header="Radio 3 - group" ToggleType="Radio">
-                    <MenuItem Header="Radio 4 - group" ToggleType="Radio" GroupName="A" />
-                    <MenuItem Header="Radio 5 - group" ToggleType="Radio" GroupName="A" />
-                </MenuItem>
-                <Separator />
-                <MenuItem Header="Radio 1" ToggleType="Radio" />
-                <MenuItem IsChecked="True" Header="Radio 2" ToggleType="Radio" />
-                <MenuItem Header="Radio 3" ToggleType="Radio">
-                    <MenuItem Header="Radio 4" ToggleType="Radio" />
-                    <MenuItem Header="Radio 5" ToggleType="Radio" />
-                </MenuItem>
             </MenuItem>
             <MenuItem Header="Parent">
                 <MenuItem Header="Child 1" />
@@ -102,7 +86,7 @@
                         <MenuItem Header="Submenu _1" />
                         <MenuItem Header="Submenu _2" />
                     </MenuItem>
-                    <MenuItem Header="Menu Item with _Icon">
+                    <MenuItem Header="Menu Item with _Checkbox">
                         <MenuItem.Icon>
                             <CheckBox
                                 Padding="0"
@@ -111,7 +95,6 @@
                                 IsHitTestVisible="False" />
                         </MenuItem.Icon>
                     </MenuItem>
-                    <MenuItem Header="Menu Item with _Checkbox" ToggleType="CheckBox" />
                     <MenuItem Header="Menu Item that won't close on click" StaysOpenOnClick="True" />
                 </ContextMenu>
             </Border.ContextMenu>
@@ -130,7 +113,7 @@
                         <MenuItem Header="Submenu _1" />
                         <MenuItem Header="Submenu _2" />
                     </MenuItem>
-                    <MenuItem Header="Menu Item with _Icon">
+                    <MenuItem Header="Menu Item with _Checkbox">
                         <MenuItem.Icon>
                             <CheckBox
                                 Padding="0"
@@ -139,7 +122,6 @@
                                 IsHitTestVisible="False" />
                         </MenuItem.Icon>
                     </MenuItem>
-                    <MenuItem Header="Menu Item with _Checkbox" ToggleType="CheckBox" />
                 </MenuFlyout>
             </Border.ContextFlyout>
             <TextBlock Text="Right Click to show Context Flyout" />

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

@@ -7,36 +7,11 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <StackPanel Spacing="20">
+    <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <UniformGrid Rows="3" Columns="3" Width="500" HorizontalAlignment="Left">
+        <Button Click="InfoButton_OnClick" Content="Default" />
-            <UniformGrid.Styles>
+        <Button Click="InfoButton_OnClick" Content="Information" />
-                <Style Selector="RadioButton">
+        <Button Click="InfoButton_OnClick" Content="Success" />
-                    <Setter Property="Theme" Value="{DynamicResource PureCardRadioButton}" />
+        <Button Click="InfoButton_OnClick" Content="Warning" />
-                </Style>
+        <Button Click="InfoButton_OnClick" Content="Error" />
-            </UniformGrid.Styles>
-            <RadioButton Click="PositionButton_OnClick" Content="TopLeft" />
-            <RadioButton Click="PositionButton_OnClick" Content="TopCenter" />
-            <RadioButton Click="PositionButton_OnClick" Content="TopRight" IsChecked="True" />
-            <RadioButton Click="PositionButton_OnClick" Content="BottomLeft" />
-            <RadioButton Click="PositionButton_OnClick" Content="BottomCenter" />
-            <RadioButton Click="PositionButton_OnClick" Content="BottomRight" />
-        </UniformGrid>
-        <StackPanel Orientation="Horizontal" Spacing="20">
-            <Button Click="NormalButton_OnClick" Content="Information" />
-            <Button Click="NormalButton_OnClick" Content="Success" Classes="Success" />
-            <Button Click="NormalButton_OnClick" Content="Warning" Classes="Warning" />
-            <Button Click="NormalButton_OnClick" Content="Error" Classes="Danger" />
-        </StackPanel>
-        <StackPanel Orientation="Horizontal" Spacing="20">
-            <StackPanel.Styles>
-                <Style Selector="Button">
-                    <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
-                </Style>
-            </StackPanel.Styles>
-            <Button Click="LightButton_OnClick" Content="Information" />
-            <Button Click="LightButton_OnClick" Content="Success" Classes="Success" />
-            <Button Click="LightButton_OnClick" Content="Warning" Classes="Warning" />
-            <Button Click="LightButton_OnClick" Content="Error" Classes="Danger" />
-        </StackPanel>
     </StackPanel>
-</UserControl>
+</UserControl>

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

@@ -22,34 +22,13 @@ public partial class NotificationDemo : UserControl
         _manager = new WindowNotificationManager(topLevel) { MaxItems = 3 };
     }
 
-    private void PositionButton_OnClick(object? sender, RoutedEventArgs e)
+    private void InfoButton_OnClick(object? sender, RoutedEventArgs e)
-    {
-        if (sender is RadioButton b && b.Content is string s)
-        {
-            Enum.TryParse<NotificationPosition>(s, out var t);
-            _manager.Position = t;
-        }
-    }
-
-    private void NormalButton_OnClick(object? sender, RoutedEventArgs e)
     {
         if (sender is Button b && b.Content is string s)
         {
-            _manager?.Show(Enum.TryParse<NotificationType>(s, out var t)
+            _manager?.Show(Enum.TryParse<NotificationType>(s, out NotificationType t)
                 ? new Notification(t.ToString(), "This is message", t)
                 : new Notification(s, "This is message"));
         }
     }
-
-    private void LightButton_OnClick(object? sender, RoutedEventArgs e)
-    {
-        if (sender is Button b && b.Content is string s)
-        {
-            Enum.TryParse<NotificationType>(s, out var notificationType);
-            _manager?.Show(
-                new Notification(notificationType.ToString(), "This is message"),
-                type: notificationType,
-                classes: ["Light"]);
-        }
-    }
 }

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

@@ -4,53 +4,38 @@
     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="800"
+    d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
     <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <StackPanel.Styles>
+        <NumericUpDown
-            <Style Selector="NumericUpDown">
+            Width="200"
-                <Setter Property="Width" Value="300" />
+            Maximum="100"
-                <Setter Property="Maximum" Value="100" />
+            Minimum="0" />
-                <Setter Property="Minimum" Value="0" />
+        <NumericUpDown
-            </Style>
+            Width="200"
-        </StackPanel.Styles>
+            Increment="10"
-
+            Maximum="100"
-        <NumericUpDown />
+            Minimum="0" />
-        <NumericUpDown Increment="10" />
+        <NumericUpDown
-        <NumericUpDown ButtonSpinnerLocation="Left" />
+            Width="200"
-        <NumericUpDown ShowButtonSpinner="False" />
+            ButtonSpinnerLocation="Left"
-        <NumericUpDown Classes="Large" />
+            Maximum="100"
-        <NumericUpDown Classes="Small" />
+            Minimum="0" />
-        <NumericUpDown InnerLeftContent="Price" InnerRightContent="$" />
+        <NumericUpDown
-
+            Width="200"
-        <StackPanel Orientation="Horizontal">
+            Maximum="100"
-            <NumericUpDown
+            Minimum="0"
-                Width="100"
+            ShowButtonSpinner="False" />
-                Classes="Large"
+        <NumericUpDown
-                Watermark="Large"
+            Width="200"
-                ButtonSpinnerLocation="Left" />
+            Classes="Large"
-            <NumericUpDown
+            Maximum="100"
-                Width="100"
+            Minimum="0" />
-                Watermark="Default"
+        <NumericUpDown
-                ShowButtonSpinner="False" />
+            Width="200"
-            <NumericUpDown
+            Classes="Small"
-                Width="100"
+            Maximum="100"
-                Watermark="Small"
+            Minimum="0" />
-                Classes="Small" />
-        </StackPanel>
-
-        <StackPanel Orientation="Horizontal">
-            <NumericUpDown Width="100" ButtonSpinnerLocation="Left" />
-            <NumericUpDown Width="100" ShowButtonSpinner="False" />
-            <NumericUpDown Width="100" />
-        </StackPanel>
-
-        <StackPanel Orientation="Horizontal">
-            <NumericUpDown Width="100" ShowButtonSpinner="False" />
-            <NumericUpDown Width="100" IsEnabled="False" />
-            <NumericUpDown Width="100" ButtonSpinnerLocation="Left" />
-        </StackPanel>
-
     </StackPanel>
-</UserControl>
+</UserControl>

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

@@ -87,37 +87,31 @@
                                 Margin="0,8"
                                 Classes="Primary"
                                 Content="Primary"
-                                HorizontalAlignment="Stretch"
                                 Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Margin="0,8"
                                 Classes="Secondary"
                                 Content="Secondary"
-                                HorizontalAlignment="Stretch"
                                 Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Margin="0,8"
                                 Classes="Tertiary"
                                 Content="Tertiary"
-                                HorizontalAlignment="Stretch"
                                 Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Margin="0,8"
                                 Classes="Success"
                                 Content="Success"
-                                HorizontalAlignment="Stretch"
                                 Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Margin="0,8"
                                 Classes="Warning"
                                 Content="Warning"
-                                HorizontalAlignment="Stretch"
                                 Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Margin="0,8"
                                 Classes="Danger"
                                 Content="Danger"
-                                HorizontalAlignment="Stretch"
                                 Theme="{DynamicResource SolidButton}" />
                         </StackPanel>
                         <Calendar Margin="16,0" />
@@ -200,32 +194,26 @@
                         <StackPanel Margin="16,0">
                             <Button
                                 Margin="0,8"
-                                HorizontalAlignment="Stretch"
                                 Classes="Primary"
                                 Content="Primary" />
                             <Button
                                 Margin="0,8"
-                                HorizontalAlignment="Stretch"
                                 Classes="Secondary"
                                 Content="Secondary" />
                             <Button
                                 Margin="0,8"
-                                HorizontalAlignment="Stretch"
                                 Classes="Tertiary"
                                 Content="Tertiary" />
                             <Button
                                 Margin="0,8"
-                                HorizontalAlignment="Stretch"
                                 Classes="Success"
                                 Content="Success" />
                             <Button
                                 Margin="0,8"
-                                HorizontalAlignment="Stretch"
                                 Classes="Warning"
                                 Content="Warning" />
                             <Button
                                 Margin="0,8"
-                                HorizontalAlignment="Stretch"
                                 Classes="Danger"
                                 Content="Danger" />
                         </StackPanel>

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

@@ -1,4 +1,8 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.Styling;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -9,41 +13,35 @@ public partial class Overview : UserControl
         InitializeComponent();
     }
 
-    public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.1.0";
+    public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.0.7";
 
-    public string MainStyle { get; set; } =
+    public string MainStyle { get; set; } = """
-        """
+<Application.Styles>
-        <Application.Styles>
+    <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
-        <!-- You can still reference in old way.  -->
+</Application.Styles>
-        <!-- <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" /> -->
+""";
-            <semi:SemiTheme Locale="zh-cn" />
-        </Application.Styles>
-        """;
 
-    public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.1.0";
+    public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.0.7";
 
-    public string ColorPickerStyle { get; set; } =
+    public string ColorPickerStyle { get; set; } = """
-        """
+<Application.Styles>
-        <Application.Styles>
+    <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
-            <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
+</Application.Styles>
-        </Application.Styles>
+""";
-        """;
 
-    public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.1.0";
+    public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.0.7";
 
-    public string DataGridStyle { get; set; } =
+    public string DataGridStyle { get; set; } = """
-        """
+<Application.Styles>
-        <Application.Styles>
+    <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
-            <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
+</Application.Styles>
-        </Application.Styles>
+""";
-        """;
 
-    public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid --version 11.1.0";
+    public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.7";
 
-    public string TreeDataGridStyle { get; set; } =
+    public string TreeDataGridStyle { get; set; } = """
-        """
+<Application.Styles>
-        <Application.Styles>
+    <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
-            <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
+</Application.Styles>
-        </Application.Styles>
+""";
-        """;
 }

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

@@ -4,24 +4,12 @@
     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:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    x:DataType="pages:RefreshContainerDemoViewModel"
-    x:CompileBindings="True"
     mc:Ignorable="d">
-    <DockPanel HorizontalAlignment="Stretch" VerticalAlignment="Top">
+    <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <Label DockPanel.Dock="Top">A control that supports pull to refresh</Label>
+        <RefreshContainer Name="container">
-        <RefreshContainer Name="Refresh"
+            <TextBlock Text="Content" />
-                          DockPanel.Dock="Bottom"
-                          HorizontalAlignment="Stretch"
-                          VerticalAlignment="Stretch"
-                          PullDirection="TopToBottom"
-                          RefreshRequested="RefreshContainerPage_RefreshRequested"
-                          Margin="5">
-            <ListBox HorizontalAlignment="Stretch"
-                     VerticalAlignment="Top"
-                     ItemsSource="{Binding Items}" />
         </RefreshContainer>
-    </DockPanel>
+    </StackPanel>
 </UserControl>

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

@@ -1,46 +1,14 @@
-using System.Collections.ObjectModel;
+using Avalonia;
-using System.Linq;
-using System.Threading.Tasks;
 using Avalonia.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
 public partial class RefreshContainerDemo : UserControl
 {
-    private RefreshContainerDemoViewModel _viewModel;
-
     public RefreshContainerDemo()
     {
         InitializeComponent();
-
-        _viewModel = new RefreshContainerDemoViewModel();
-
-        DataContext = _viewModel;
-    }
-
-    private async void RefreshContainerPage_RefreshRequested(object? sender, RefreshRequestedEventArgs e)
-    {
-        var deferral = e.GetDeferral();
-
-        await _viewModel.AddToTop();
-
-        deferral.Complete();
-    }
-}
-
-public class RefreshContainerDemoViewModel : ObservableObject
-{
-    public ObservableCollection<string> Items { get; }
-
-    public RefreshContainerDemoViewModel()
-    {
-        Items = new ObservableCollection<string>(Enumerable.Range(1, 200).Select(i => $"Item {i}"));
-    }
-
-    public async Task AddToTop()
-    {
-        await Task.Delay(1000);
-        Items.Insert(0, $"Item {200 - Items.Count}");
     }
 }

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

@@ -46,7 +46,7 @@
                         Grid.Row="2" Grid.Column="1"
                         OffContent="Left"
                         OnContent="Right"
-                        IsChecked="{Binding #SplitView.PanePlacement}" />
+                        IsChecked="{Binding #SplitView.PanePlacement, Mode=OneWayToSource}" />
 
                     <Label
                         Grid.Row="3" Grid.Column="0"

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

@@ -5,7 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:system="clr-namespace:System;assembly=netstandard"
-    d:DesignHeight="800"
+    d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
     <ScrollViewer>
@@ -24,9 +24,8 @@
             <TextBox Width="300" PasswordChar="*" />
             <TextBox
                 Width="300"
-                Classes="ClearButton RevealPasswordButton"
+                Classes="revealPasswordButton"
-                PasswordChar="*"
+                PasswordChar="*" />
-                Text="123456" />
             <TextBox
                 Width="500"
                 InnerLeftContent="http://"
@@ -43,41 +42,7 @@
                 InnerLeftContent="http://"
                 InnerRightContent=".com"
                 IsEnabled="False" />
-            <StackPanel Orientation="Horizontal">
-                <TextBox
-                    Width="150"
-                    Classes="Large"
-                    Watermark="Large" />
-                <TextBox
-                    Width="150"
-                    Watermark="Default" />
-                <TextBox
-                    Width="150"
-                    Classes="Small"
-                    Watermark="Small" />
-            </StackPanel>
-
-            <StackPanel Orientation="Horizontal">
-                <TextBox
-                    Width="150"
-                    IsEnabled="False"
-                    Watermark="Disabled" />
-                <TextBox
-                    Width="150"
-                    Classes="Bordered"
-                    Watermark="Bordered" />
-                <TextBox
-                    Width="150"
-                    Classes="Bordered"
-                    IsEnabled="False" />
-            </StackPanel>
             <TextBox Width="300" Classes="TextArea" />
-            <TextBox
-                Width="300"
-                Theme="{StaticResource LooklessTextBox}"
-                Watermark="Lookless TextBox"
-                InnerLeftContent="http://"
-                InnerRightContent=".com" />
         </StackPanel>
     </ScrollViewer>
 </UserControl>

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

@@ -15,16 +15,5 @@
         <TimePicker ClockIdentifier="12HourClock" IsEnabled="False" />
         <TimePicker Classes="Large" />
         <TimePicker Classes="Small" />
-        <StackPanel Orientation="Horizontal">
-            <TimePicker Classes="Large" ClockIdentifier="12HourClock"/>
-            <TimePicker ClockIdentifier="12HourClock"/>
-            <TimePicker Classes="Small" ClockIdentifier="12HourClock"/>
-        </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <TimePicker IsEnabled="False" />
-            <TimePicker Classes="Bordered" />
-            <TimePicker Classes="Bordered" IsEnabled="False" />
-        </StackPanel>
-
     </StackPanel>
 </UserControl>

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

@@ -26,38 +26,15 @@
             OnContent="OnContent" />
         <StackPanel Orientation="Horizontal">
             <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Small" />
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Small" IsChecked="True" />
+            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Small" IsChecked="True"/>
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Small Loading" />
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Small Loading" IsChecked="True" />
         </StackPanel>
         <StackPanel Orientation="Horizontal">
             <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" />
             <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" IsChecked="True" />
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Loading" />
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Loading" IsChecked="True" />
         </StackPanel>
         <StackPanel Orientation="Horizontal">
             <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Large" />
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Large" IsChecked="True" />
+            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Large" IsChecked="True"/>
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Large Loading" />
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" Classes="Large Loading" IsChecked="True" />
-        </StackPanel>
-
-        <StackPanel Orientation="Horizontal">
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="关" OnContent="开"/>
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="〇" OnContent="｜"/>
-        </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="关" OnContent="开" IsChecked="True" />
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="〇" OnContent="｜" IsChecked="True" />
-        </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="关" OnContent="开" Classes="Large" />
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="〇" OnContent="｜" Classes="Large" />
-        </StackPanel>
-        <StackPanel Orientation="Horizontal">
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="关" OnContent="开" Classes="Large" IsChecked="True" />
-            <ToggleSwitch Theme="{StaticResource SimpleToggleSwitch}" OffContent="〇" OnContent="｜" Classes="Large" IsChecked="True" />
         </StackPanel>
 
         <ToggleSwitch Theme="{DynamicResource ButtonToggleSwitch}">

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

@@ -4,7 +4,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
-    
+
     <ItemGroup>
         <AvaloniaResource Include="Assets\**" />
     </ItemGroup>
@@ -14,12 +14,12 @@
         <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
         <!--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 Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\Semi.Avalonia.ColorPicker\Semi.Avalonia.ColorPicker.csproj" />
+        <ProjectReference Include="..\..\src\Semi.Avalonia.ColorPicker\Semi.Avalonia.ColorPicker.csproj" />
-      <ProjectReference Include="..\..\src\Semi.Avalonia.DataGrid\Semi.Avalonia.DataGrid.csproj" />
+        <ProjectReference Include="..\..\src\Semi.Avalonia.DataGrid\Semi.Avalonia.DataGrid.csproj" />
-      <ProjectReference Include="..\..\src\Semi.Avalonia\Semi.Avalonia.csproj" />
+        <ProjectReference Include="..\..\src\Semi.Avalonia\Semi.Avalonia.csproj" />
     </ItemGroup>
 </Project>

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

@@ -38,42 +38,26 @@
                         Classes="Secondary"
                         Text="{Binding #tab.SelectedItem.Header}" />
                 </StackPanel>
-                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                <ToggleSwitch
-                    <Button Theme="{DynamicResource BorderlessButton}" Click="OpenDocumentation">
+                    Grid.Column="1"
+                    Padding="4"
+                    IsCheckedChanged="ToggleButton_OnIsCheckedChanged"
+                    Theme="{DynamicResource ButtonToggleSwitch}">
+                    <ToggleSwitch.OnContent>
                         <PathIcon
                             Width="16"
                             Height="16"
-                            Data="M12 21.5C10.65 20.65 8.2 20 6.5 20C4.85 20 3.15 20.3 1.75 21.05C1.65 21.1 1.6 21.1 1.5 21.1C1.25 21.1 1 20.85 1 20.6V6C1.6 5.55 2.25 5.25 3 5C4.11 4.65 5.33 4.5 6.5 4.5C8.45 4.5 10.55 4.9 12 6C13.45 4.9 15.55 4.5 17.5 4.5C18.67 4.5 19.89 4.65 21 5C21.75 5.25 22.4 5.55 23 6V20.6C23 20.85 22.75 21.1 22.5 21.1C22.4 21.1 22.35 21.1 22.25 21.05C20.85 20.3 19.15 20 17.5 20C15.8 20 13.35 20.65 12 21.5M12 8V19.5C13.35 18.65 15.8 18 17.5 18C18.7 18 19.9 18.15 21 18.5V7C19.9 6.65 18.7 6.5 17.5 6.5C15.8 6.5 13.35 7.15 12 8M13 11.5C14.11 10.82 15.6 10.5 17.5 10.5C18.41 10.5 19.26 10.59 20 10.78V9.23C19.13 9.08 18.29 9 17.5 9C15.73 9 14.23 9.28 13 9.84V11.5M17.5 11.67C15.79 11.67 14.29 11.93 13 12.46V14.15C14.11 13.5 15.6 13.16 17.5 13.16C18.54 13.16 19.38 13.24 20 13.4V11.9C19.13 11.74 18.29 11.67 17.5 11.67M20 14.57C19.13 14.41 18.29 14.33 17.5 14.33C15.67 14.33 14.17 14.6 13 15.13V16.82C14.11 16.16 15.6 15.83 17.5 15.83C18.54 15.83 19.38 15.91 20 16.07V14.57Z"
+                            Data="M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17 15C17.476 15 17.9408 14.9525 18.3901 14.862C17.296 17.3011 14.8464 19 12 19C8.13401 19 5 15.866 5 12C5 8.60996 7.40983 5.78277 10.6099 5.13803C10.218 6.01173 10 6.98041 10 8C10 11.866 13.134 15 17 15Z"
                             Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
-                    </Button>
+                    </ToggleSwitch.OnContent>
-                    <Button Theme="{DynamicResource BorderlessButton}" Click="OpenRepository">
+                    <ToggleSwitch.OffContent>
                         <PathIcon
                             Width="16"
                             Height="16"
-                            Data="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z"
+                            Data="M3.55 19.09L4.96 20.5L6.76 18.71L5.34 17.29M12 6C8.69 6 6 8.69 6 12S8.69 18 12 18 18 15.31 18 12C18 8.68 15.31 6 12 6M20 13H23V11H20M17.24 18.71L19.04 20.5L20.45 19.09L18.66 17.29M20.45 5L19.04 3.6L17.24 5.39L18.66 6.81M13 1H11V4H13M6.76 5.39L4.96 3.6L3.55 5L5.34 6.81L6.76 5.39M1 13H4V11H1M13 20H11V23H13"
                             Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
-                    </Button>
+                    </ToggleSwitch.OffContent>
-                    <ToggleSwitch
+                </ToggleSwitch>
-                        Grid.Column="1"
-                        Padding="4"
-                        IsCheckedChanged="ToggleButton_OnIsCheckedChanged"
-                        Theme="{DynamicResource ButtonToggleSwitch}">
-                        <ToggleSwitch.OnContent>
-                            <PathIcon
-                                Width="16"
-                                Height="16"
-                                Data="M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17 15C17.476 15 17.9408 14.9525 18.3901 14.862C17.296 17.3011 14.8464 19 12 19C8.13401 19 5 15.866 5 12C5 8.60996 7.40983 5.78277 10.6099 5.13803C10.218 6.01173 10 6.98041 10 8C10 11.866 13.134 15 17 15Z"
-                                Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
-                        </ToggleSwitch.OnContent>
-                        <ToggleSwitch.OffContent>
-                            <PathIcon
-                                Width="16"
-                                Height="16"
-                                Data="M3.55 19.09L4.96 20.5L6.76 18.71L5.34 17.29M12 6C8.69 6 6 8.69 6 12S8.69 18 12 18 18 15.31 18 12C18 8.68 15.31 6 12 6M20 13H23V11H20M17.24 18.71L19.04 20.5L20.45 19.09L18.66 17.29M20.45 5L19.04 3.6L17.24 5.39L18.66 6.81M13 1H11V4H13M6.76 5.39L4.96 3.6L3.55 5L5.34 6.81L6.76 5.39M1 13H4V11H1M13 20H11V23H13"
-                                Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
-                        </ToggleSwitch.OffContent>
-                    </ToggleSwitch>
-                </StackPanel>
             </Grid>
 
         </Border>
@@ -142,9 +126,6 @@
             <TabItem Header="HeaderedContentControl">
                 <pages:HeaderedContentControlDemo />
             </TabItem>
-            <TabItem Header="HyperlinkButton">
-                <pages:HyperlinkButtonDemo />
-            </TabItem>
             <TabItem Header="Label">
                 <pages:LabelDemo />
             </TabItem>
@@ -164,7 +145,7 @@
                 <pages:NumericUpDownDemo />
             </TabItem>
             <TabItem Header="PathIcon">
-                <pages:PathIconDemo />
+                <pages:PathIconDemo/>
             </TabItem>
             <TabItem Header="ProgressBar">
                 <pages:ProgressBarDemo />

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

@@ -1,4 +1,3 @@
-using System;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
@@ -22,20 +21,4 @@ public partial class MainView : UserControl
             app.RequestedThemeVariant = theme == ThemeVariant.Dark ? ThemeVariant.Light : ThemeVariant.Dark;
         }
     }
-
-    private async void OpenRepository(object sender, RoutedEventArgs e)
-    {
-        var top = TopLevel.GetTopLevel(this);
-        if (top is null) return;
-        var launcher = top.Launcher;
-        await launcher.LaunchUriAsync(new Uri("https://github.com/irihitech/Semi.Avalonia"));
-    }
-
-    private async void OpenDocumentation(object sender, RoutedEventArgs e)
-    {
-        var top = TopLevel.GetTopLevel(this);
-        if (top is null) return;
-        var launcher = top.Launcher;
-        await launcher.LaunchUriAsync(new Uri("https://docs.irihi.tech/semi"));
-    }
 }

src/Package.props

@@ -3,14 +3,14 @@
         <TargetFrameworks>net6.0;net8.0;netstandard2.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
-        <Version>11.1.0.2</Version>
+        <Version>11.0.7.5</Version>
         <Authors>IRIHI Technology Co., Ltd.</Authors>
         <Description>Avalonia Theme inspired by Semi Design.</Description>
         <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageIcon>irihi.png</PackageIcon>
         <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
-        <AvaloniaVersion>11.1.0</AvaloniaVersion>
+        <AvaloniaVersion>11.0.7</AvaloniaVersion>
     </PropertyGroup>
 
     <ItemGroup>

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

@@ -17,33 +17,10 @@
     <converters:ToBrushConverter x:Key="ToBrushConverter" />
 
     <ControlTheme x:Key="{x:Type ColorPicker}" TargetType="ColorPicker">
-        <Setter Property="CornerRadius" Value="3" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Height" Value="32" />
         <Setter Property="Width" Value="64" />
         <Setter Property="MinWidth" Value="64" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="Content">
-            <Template>
-                <Panel>
-                    <Border
-                        Margin="1,1,0,1"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
-                        CornerRadius="{TemplateBinding CornerRadius,
-                                                       Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-                    <Border
-                        Margin="1,1,0,1"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Background="{TemplateBinding HsvColor,
-                                                     Converter={StaticResource ToBrushConverter}}"
-                        CornerRadius="{TemplateBinding CornerRadius,
-                                                       Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-                </Panel>
-            </Template>
-        </Setter>
         <Setter Property="Palette">
             <controls:FluentColorPalette />
         </Setter>
@@ -56,8 +33,6 @@
                     HorizontalContentAlignment="Stretch"
                     VerticalContentAlignment="Stretch"
                     ClipToBounds="True"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
                     CornerRadius="{TemplateBinding CornerRadius}"
                     UseLayoutRounding="False">
                     <DropDownButton.Styles>
@@ -65,6 +40,26 @@
                             <Setter Property="Padding" Value="0" />
                         </Style>
                     </DropDownButton.Styles>
+                    <DropDownButton.Content>
+                        <!--  Preview color  -->
+                        <Panel>
+                            <Border
+                                Margin="1,1,0,1"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
+                                CornerRadius="{TemplateBinding CornerRadius,
+                                                               Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                            <Border
+                                Margin="1,1,0,1"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="{TemplateBinding HsvColor,
+                                                             Converter={StaticResource ToBrushConverter}}"
+                                CornerRadius="{TemplateBinding CornerRadius,
+                                                               Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                        </Panel>
+                    </DropDownButton.Content>
                     <DropDownButton.Flyout>
                         <Flyout FlyoutPresenterClasses="nopadding" Placement="{DynamicResource ColorPickerFlyoutPlacement}">
 
@@ -172,7 +167,7 @@
                                                 Orientation="Vertical">
                                                 <primitives:ColorSlider.IsVisible>
                                                     <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                                        <Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
+                                                        <ReflectionBinding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
                                                     </MultiBinding>
                                                 </primitives:ColorSlider.IsVisible>
                                             </primitives:ColorSlider>
@@ -234,7 +229,7 @@
                                             RowDefinitions="Auto,24,1*,1*,1*,1*,12"
                                             Tag="{TemplateBinding ColorModel}">
                                             <Grid.Styles>
-                                                <Style Selector="NumericUpDown">
+                                                <Style Selector="NumericUpDown /template/ TextBox">
                                                     <Setter Property="InnerLeftContent">
                                                         <Template>
                                                             <TextBlock Width="12" Text="{Binding $parent[NumericUpDown].Tag}" />
@@ -430,8 +425,8 @@
                                                 Value="{Binding Value, ElementName=AlphaComponentSlider}">
                                                 <NumericUpDown.IsVisible>
                                                     <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                                        <Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
+                                                        <ReflectionBinding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
-                                                        <Binding Path="IsComponentTextInputVisible" RelativeSource="{RelativeSource TemplatedParent}" />
+                                                        <ReflectionBinding Path="IsComponentTextInputVisible" RelativeSource="{RelativeSource TemplatedParent}" />
                                                     </MultiBinding>
                                                 </NumericUpDown.IsVisible>
                                             </NumericUpDown>
@@ -452,8 +447,8 @@
                                                 TickFrequency="1">
                                                 <primitives:ColorSlider.IsVisible>
                                                     <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                                        <Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
+                                                        <ReflectionBinding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
-                                                        <Binding Path="IsComponentSliderVisible" RelativeSource="{RelativeSource TemplatedParent}" />
+                                                        <ReflectionBinding Path="IsComponentSliderVisible" RelativeSource="{RelativeSource TemplatedParent}" />
                                                     </MultiBinding>
                                                 </primitives:ColorSlider.IsVisible>
                                             </primitives:ColorSlider>
@@ -476,237 +471,4 @@
         </Setter>
     </ControlTheme>
 
-    <ControlTheme
-        x:Key="HexColorPicker"
-        BasedOn="{StaticResource {x:Type ColorPicker}}"
-        TargetType="ColorPicker">
-        <Setter Property="Width" Value="200" />
-        <Setter Property="Content">
-            <Template>
-                <Grid ColumnDefinitions="Auto, *">
-                    <Border
-                        Grid.Column="0"
-                        Width="{Binding $self.Bounds.Height}"
-                        Margin="1,1,0,1"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
-                        CornerRadius="{TemplateBinding CornerRadius}" />
-                    <Border
-                        Grid.Column="0"
-                        Width="{Binding $self.Bounds.Height}"
-                        Margin="1,1,0,1"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Background="{TemplateBinding HsvColor,
-                                                     Converter={StaticResource ToBrushConverter}}"
-                        CornerRadius="{TemplateBinding CornerRadius}" />
-                    <TextBlock
-                        Grid.Column="1"
-                        Margin="8,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        FontWeight="Regular"
-                        Foreground="{DynamicResource TextBlockDefaultForeground}"
-                        Text="{Binding $parent[ColorPicker].Color}" />
-                </Grid>
-            </Template>
-        </Setter>
-    </ControlTheme>
-
-    <ControlTheme
-        x:Key="SimpleColorPicker"
-        BasedOn="{StaticResource {x:Type ColorPicker}}"
-        TargetType="ColorPicker">
-        <Setter Property="ColorSpectrumComponents" Value="SaturationValue" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="{x:Type ColorPicker}">
-                <DropDownButton
-                    Width="{TemplateBinding Width}"
-                    Height="{TemplateBinding Height}"
-                    Padding="0,0,10,0"
-                    HorizontalContentAlignment="Stretch"
-                    VerticalContentAlignment="Stretch"
-                    ClipToBounds="True"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    UseLayoutRounding="False">
-                    <DropDownButton.Styles>
-                        <Style Selector="FlyoutPresenter.nopadding">
-                            <Setter Property="Padding" Value="0" />
-                        </Style>
-                    </DropDownButton.Styles>
-                    <DropDownButton.Flyout>
-                        <Flyout FlyoutPresenterClasses="nopadding" Placement="{DynamicResource SimpleColorPickerFlyoutPlacement}">
-
-                            <!--
-                                The following is copy-pasted from the ColorView's control template.
-                                It MUST always be kept in sync with the ColorView (which is master).
-                                Note the only changes are resources specific to the ColorPicker.
-                            -->
-                            <Grid Width="280">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="*" MinHeight="280" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-                                <!--  Spectrum Tab  -->
-                                <Border
-                                    Grid.Row="0"
-                                    CornerRadius="8 8 0 0"
-                                    ClipToBounds="True">
-                                    <primitives:ColorSpectrum
-                                        x:Name="ColorSpectrum"
-                                        HorizontalAlignment="Stretch"
-                                        VerticalAlignment="Stretch"
-                                        Components="{TemplateBinding ColorSpectrumComponents}"
-                                        HsvColor="{TemplateBinding HsvColor, Mode=TwoWay}"
-                                        MaxHue="{TemplateBinding MaxHue}"
-                                        MaxSaturation="{TemplateBinding MaxSaturation}"
-                                        MaxValue="{TemplateBinding MaxValue}"
-                                        MinHue="{TemplateBinding MinHue}"
-                                        MinSaturation="{TemplateBinding MinSaturation}"
-                                        MinValue="{TemplateBinding MinValue}"
-                                        Shape="{TemplateBinding ColorSpectrumShape}" />
-                                </Border>
-                                <primitives:ColorSlider
-                                    x:Name="ColorSpectrumThirdComponentSlider"
-                                    Grid.Row="1"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Center"
-                                    AutomationProperties.Name="Third Component"
-                                    ColorComponent="{Binding #ColorSpectrum.ThirdComponent}"
-                                    ColorModel="Hsva"
-                                    HsvColor="{TemplateBinding HsvColor, Mode=TwoWay}"
-                                    IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}"
-                                    Orientation="Horizontal" />
-
-                                <primitives:ColorSlider
-                                    x:Name="ColorSpectrumAlphaSlider"
-                                    Grid.Row="2"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Center"
-                                    AutomationProperties.Name="Alpha Component"
-                                    ColorComponent="Alpha"
-                                    ColorModel="Hsva"
-                                    HsvColor="{TemplateBinding HsvColor, Mode=TwoWay}"
-                                    IsEnabled="{TemplateBinding IsAlphaEnabled}"
-                                    IsVisible="{TemplateBinding IsAlphaVisible}"
-                                    IsRoundingEnabled="True"
-                                    IsSnapToTickEnabled="True"
-                                    TickFrequency="1"
-                                    Orientation="Horizontal">
-                                </primitives:ColorSlider>
-                                <StackPanel
-                                    Grid.Row="3"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Center"
-                                    Orientation="Horizontal"
-                                    Margin="0 8 0 0">
-                                    <Border
-                                        Background="{TemplateBinding Color, Converter={StaticResource ToBrushConverter}}"
-                                        Width="20"
-                                        Height="20"
-                                        CornerRadius="4" />
-                                    <Panel
-                                        x:Name="PART_TextBoxPanel"
-                                        Width="106"
-                                        Margin="4 0 0 0"
-                                        HorizontalAlignment="Stretch"
-                                        VerticalAlignment="Center">
-                                        <TextBox
-                                            x:Name="PART_HexTextBox"
-                                            Classes="Small"
-                                            InnerLeftContent="#"
-                                            IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hex}"
-                                            Text="{TemplateBinding Color, Converter={StaticResource ColorToHexConverter}, Mode=TwoWay}"
-                                            MaxLength="8" />
-                                        <TextBox
-                                            x:Name="PART_RgbaTextBox"
-                                            Classes="Small"
-                                            IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Rgba}"
-                                            Text="{TemplateBinding Color, Converter={StaticResource ColorToTextConverter}, Mode=TwoWay}" />
-                                        <TextBox
-                                            x:Name="PART_HsvaTextBox"
-                                            Classes="Small"
-                                            IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hsva}"
-                                            Text="{TemplateBinding HsvColor, Converter={StaticResource HsvColorToTextConverter}, Mode=TwoWay}" />
-                                    </Panel>
-
-                                    <NumericUpDown
-                                        x:Name="AlphaComponentNumericUpDown"
-                                        Width="70"
-                                        HorizontalAlignment="Right"
-                                        VerticalAlignment="Center"
-                                        AllowSpin="True"
-                                        Classes="Small"
-                                        IsEnabled="{TemplateBinding IsAlphaEnabled}"
-                                        Maximum="{Binding #ColorSpectrumAlphaSlider.Maximum}"
-                                        Minimum="{Binding #ColorSpectrumAlphaSlider.Minimum}"
-                                        NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
-                                        ShowButtonSpinner="False"
-                                        InnerRightContent="%"
-                                        IsVisible="{TemplateBinding IsAlphaVisible}"
-                                        Value="{Binding #ColorSpectrumAlphaSlider.Value}" />
-                                    <ComboBox
-                                        x:Name="ColorModelComboBox"
-                                        Width="80"
-                                        VerticalAlignment="Center"
-                                        Classes="Small"
-                                        SelectedValue="Hex">
-                                        Hex<ColorModel>Rgba</ColorModel>
-                                        <ColorModel>Hsva</ColorModel>
-                                    </ComboBox>
-                                </StackPanel>
-                            </Grid>
-                        </Flyout>
-                    </DropDownButton.Flyout>
-                </DropDownButton>
-            </ControlTemplate>
-        </Setter>
-        <Style Selector="^[IsAlphaVisible=False] /template/ Panel#PART_TextBoxPanel">
-            <Setter Property="Width" Value="176" />
-        </Style>
-    </ControlTheme>
-
-    <ControlTheme
-        x:Key="HexSimpleColorPicker"
-        BasedOn="{StaticResource SimpleColorPicker}"
-        TargetType="ColorPicker">
-        <Setter Property="Width" Value="200" />
-        <Setter Property="Content">
-            <Template>
-                <Grid ColumnDefinitions="Auto, *">
-                    <Border
-                        Grid.Column="0"
-                        Width="{Binding $self.Bounds.Height}"
-                        Margin="1,1,0,1"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
-                        CornerRadius="{TemplateBinding CornerRadius}" />
-                    <Border
-                        Grid.Column="0"
-                        Width="{Binding $self.Bounds.Height}"
-                        Margin="1,1,0,1"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Background="{TemplateBinding HsvColor,
-                                                     Converter={StaticResource ToBrushConverter}}"
-                        CornerRadius="{TemplateBinding CornerRadius}" />
-                    <TextBlock
-                        Grid.Column="1"
-                        Margin="8,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        FontWeight="Regular"
-                        Foreground="{DynamicResource TextBlockDefaultForeground}"
-                        Text="{Binding $parent[ColorPicker].Color}" />
-                </Grid>
-            </Template>
-        </Setter>
-    </ControlTheme>
-
 </ResourceDictionary>

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

@@ -6,17 +6,13 @@
     xmlns:globalization="using:System.Globalization"
     xmlns:pc="using:Avalonia.Controls.Primitives.Converters"
     xmlns:primitives="using:Avalonia.Controls.Primitives"
-    xmlns:cvts="clr-namespace:Semi.Avalonia.ColorPicker.Converters"
     x:CompileBindings="True">
+    <!--  Add Resources Here  -->
     <pc:ContrastBrushConverter x:Key="ContrastBrushConverter" />
     <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayNameConverter" />
     <converters:ColorToHexConverter x:Key="ColorToHexConverter" />
     <converters:DoNothingForNullConverter x:Key="DoNothingForNullConverter" />
     <converters:EnumToBoolConverter x:Key="EnumToBoolConverter" />
-    <converters:ToBrushConverter x:Key="ToBrushConverter" />
-    <cvts:HsvColorToTextConverter x:Key="HsvColorToTextConverter" />
-    <cvts:ColorToTextConverter x:Key="ColorToTextConverter" />
-    <cvts:ToColorModel x:Key="ToColorModel" />
     <globalization:NumberFormatInfo x:Key="ColorViewComponentNumberFormat" NumberDecimalDigits="0" />
 
     <VisualBrush
@@ -264,7 +260,7 @@
                                     Orientation="Vertical">
                                     <primitives:ColorSlider.IsVisible>
                                         <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                            <Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
+                                            <ReflectionBinding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
                                         </MultiBinding>
                                     </primitives:ColorSlider.IsVisible>
                                 </primitives:ColorSlider>
@@ -326,7 +322,7 @@
                                 RowDefinitions="Auto,24,1*,1*,1*,1*,12"
                                 UseLayoutRounding="False">
                                 <Grid.Styles>
-                                    <Style Selector="NumericUpDown">
+                                    <Style Selector="NumericUpDown /template/ TextBox">
                                         <Setter Property="InnerLeftContent">
                                             <Template>
                                                 <TextBlock Width="12" Text="{Binding $parent[NumericUpDown].Tag}" />
@@ -380,7 +376,7 @@
                                         AutomationProperties.Name="Hexadecimal Color"
                                         InnerLeftContent="#"
                                         IsVisible="{TemplateBinding IsHexInputVisible}"
-                                        MaxLength="8" />
+                                        MaxLength="9" />
                                 </Grid>
                                 <!--  Color component editing controls  -->
                                 <!--  Component 1 RGB:Red HSV:Hue  -->
@@ -494,8 +490,8 @@
                                     Value="{Binding Value, ElementName=AlphaComponentSlider}">
                                     <NumericUpDown.IsVisible>
                                         <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                            <Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
+                                            <ReflectionBinding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
-                                            <Binding Path="IsComponentTextInputVisible" RelativeSource="{RelativeSource TemplatedParent}" />
+                                            <ReflectionBinding Path="IsComponentTextInputVisible" RelativeSource="{RelativeSource TemplatedParent}" />
                                         </MultiBinding>
                                     </NumericUpDown.IsVisible>
                                 </NumericUpDown>
@@ -516,8 +512,8 @@
                                     TickFrequency="1">
                                     <primitives:ColorSlider.IsVisible>
                                         <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                            <Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
+                                            <ReflectionBinding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
-                                            <Binding Path="IsComponentSliderVisible" RelativeSource="{RelativeSource TemplatedParent}" />
+                                            <ReflectionBinding Path="IsComponentSliderVisible" RelativeSource="{RelativeSource TemplatedParent}" />
                                         </MultiBinding>
                                     </primitives:ColorSlider.IsVisible>
                                 </primitives:ColorSlider>
@@ -564,142 +560,4 @@
             </Style>
         </Style>
     </ControlTheme>
-
-    <ControlTheme x:Key="SimpleColorView" TargetType="ColorView">
-        <Setter Property="Width" Value="280" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="ColorSpectrumComponents" Value="SaturationValue" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="{x:Type ColorView}">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*" MinHeight="280" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <!--  Spectrum Tab  -->
-                    <Border
-                        Grid.Row="0"
-                        CornerRadius="8 8 0 0"
-                        ClipToBounds="True">
-                        <primitives:ColorSpectrum
-                            x:Name="ColorSpectrum"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Components="{TemplateBinding ColorSpectrumComponents}"
-                            HsvColor="{TemplateBinding HsvColor, Mode=TwoWay}"
-                            MaxHue="{TemplateBinding MaxHue}"
-                            MaxSaturation="{TemplateBinding MaxSaturation}"
-                            MaxValue="{TemplateBinding MaxValue}"
-                            MinHue="{TemplateBinding MinHue}"
-                            MinSaturation="{TemplateBinding MinSaturation}"
-                            MinValue="{TemplateBinding MinValue}"
-                            Shape="{TemplateBinding ColorSpectrumShape}" />
-                    </Border>
-                    <primitives:ColorSlider
-                        x:Name="ColorSpectrumThirdComponentSlider"
-                        Grid.Row="1"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Center"
-                        AutomationProperties.Name="Third Component"
-                        ColorComponent="{Binding #ColorSpectrum.ThirdComponent}"
-                        ColorModel="Hsva"
-                        HsvColor="{TemplateBinding HsvColor, Mode=TwoWay}"
-                        IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}"
-                        Orientation="Horizontal" />
-
-                    <primitives:ColorSlider
-                        x:Name="ColorSpectrumAlphaSlider"
-                        Grid.Row="2"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Center"
-                        AutomationProperties.Name="Alpha Component"
-                        ColorComponent="Alpha"
-                        ColorModel="Hsva"
-                        HsvColor="{TemplateBinding HsvColor, Mode=TwoWay}"
-                        IsEnabled="{TemplateBinding IsAlphaEnabled}"
-                        IsVisible="{TemplateBinding IsAlphaVisible}"
-                        IsRoundingEnabled="True"
-                        IsSnapToTickEnabled="True"
-                        TickFrequency="1"
-                        Orientation="Horizontal">
-                    </primitives:ColorSlider>
-                    <StackPanel
-                        Grid.Row="3"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Center"
-                        Orientation="Horizontal"
-                        Margin="0 8 0 0">
-                        <Border
-                            Background="{TemplateBinding Color, Converter={StaticResource ToBrushConverter}}"
-                            Width="20"
-                            Height="20"
-                            CornerRadius="4" />
-                        <Panel
-                            x:Name="PART_TextBoxPanel"
-                            Width="106"
-                            Margin="4 0 0 0"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Center">
-                            <TextBox
-                                x:Name="PART_HexTextBox"
-                                Classes="Small"
-                                InnerLeftContent="#"
-                                IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hex}"
-                                Text="{TemplateBinding Color, Converter={StaticResource ColorToHexConverter}, Mode=TwoWay}"
-                                MaxLength="8" />
-                            <TextBox
-                                x:Name="PART_RgbaTextBox"
-                                Classes="Small"
-                                IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Rgba}"
-                                Text="{TemplateBinding Color, Converter={StaticResource ColorToTextConverter}, Mode=TwoWay}" />
-                            <TextBox
-                                x:Name="PART_HsvaTextBox"
-                                Classes="Small"
-                                IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hsva}"
-                                Text="{TemplateBinding HsvColor, Converter={StaticResource HsvColorToTextConverter}, Mode=TwoWay}" />
-                        </Panel>
-
-                        <NumericUpDown
-                            x:Name="AlphaComponentNumericUpDown"
-                            Width="70"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Center"
-                            AllowSpin="True"
-                            Classes="Small"
-                            IsEnabled="{TemplateBinding IsAlphaEnabled}"
-                            Maximum="{Binding #ColorSpectrumAlphaSlider.Maximum}"
-                            Minimum="{Binding #ColorSpectrumAlphaSlider.Minimum}"
-                            NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
-                            ShowButtonSpinner="False"
-                            InnerRightContent="%"
-                            IsVisible="{TemplateBinding IsAlphaVisible}"
-                            Value="{Binding #ColorSpectrumAlphaSlider.Value}" />
-                        <ComboBox
-                            x:Name="ColorModelComboBox"
-                            Width="80"
-                            VerticalAlignment="Center"
-                            Classes="Small"
-                            SelectedValue="Hex">
-                            Hex<ColorModel>Rgba</ColorModel>
-                            <ColorModel>Hsva</ColorModel>
-                        </ComboBox>
-                    </StackPanel>
-                </Grid>
-            </ControlTemplate>
-        </Setter>
-        <Style Selector="^[IsAlphaVisible=False] /template/ Panel#PART_TextBoxPanel">
-            <Setter Property="Width" Value="176" />
-        </Style>
-    </ControlTheme>
-
-    <Design.PreviewWith>
-        <ColorView
-            Theme="{StaticResource SimpleColorView}"
-            IsAlphaVisible="True"
-            IsAlphaEnabled="True"
-            ColorModel="Hsva"
-            HsvColor="hsv(120,7%,90%)" />
-    </Design.PreviewWith>
 </ResourceDictionary>

src/Semi.Avalonia.ColorPicker/Converters/ColorToTextConverter.cs

@@ -1,34 +0,0 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using Avalonia;
-using Avalonia.Data;
-using Avalonia.Data.Converters;
-using Avalonia.Media;
-
-namespace Semi.Avalonia.ColorPicker.Converters;
-
-public class ColorToTextConverter : IValueConverter
-{
-    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        return value is Color color ? $"{color.R},{color.G},{color.B},{color.A}" : AvaloniaProperty.UnsetValue;
-    }
-
-    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        if (value is not string str) return BindingOperations.DoNothing;
-        var parts = str.Split(',');
-        if (parts.Length != 4 || parts.Any(string.IsNullOrWhiteSpace)) return BindingOperations.DoNothing;
-
-        if (byte.TryParse(parts[0], NumberStyles.Integer, CultureInfo.InvariantCulture, out var r) &&
-            byte.TryParse(parts[1], NumberStyles.Integer, CultureInfo.InvariantCulture, out var g) &&
-            byte.TryParse(parts[2], NumberStyles.Integer, CultureInfo.InvariantCulture, out var b) &&
-            byte.TryParse(parts[3], NumberStyles.Integer, CultureInfo.InvariantCulture, out var a))
-        {
-            return new Color(a, r, g, b);
-        }
-
-        return BindingOperations.DoNothing;
-    }
-}

src/Semi.Avalonia.ColorPicker/Converters/HsvColorToTextConverter.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using Avalonia;
-using Avalonia.Data;
-using Avalonia.Data.Converters;
-using Avalonia.Media;
-
-namespace Semi.Avalonia.ColorPicker.Converters;
-
-public class HsvColorToTextConverter : IValueConverter
-{
-    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        return value is HsvColor hsvColor
-            ? $"{Math.Round(hsvColor.H)},{Math.Round(hsvColor.S * 100)},{Math.Round(hsvColor.V * 100)},{Math.Round(hsvColor.A * 100)}"
-            : AvaloniaProperty.UnsetValue;
-    }
-
-    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        if (value is not string str) return BindingOperations.DoNothing;
-        var parts = str.Split(',');
-        if (parts.Length != 4 || parts.Any(string.IsNullOrWhiteSpace)) return BindingOperations.DoNothing;
-
-        if (double.TryParse(parts[0], NumberStyles.Float, CultureInfo.InvariantCulture, out var h) &&
-            double.TryParse(parts[1], NumberStyles.Float, CultureInfo.InvariantCulture, out var s) &&
-            double.TryParse(parts[2], NumberStyles.Float, CultureInfo.InvariantCulture, out var v) &&
-            double.TryParse(parts[3], NumberStyles.Float, CultureInfo.InvariantCulture, out var a))
-        {
-            return new HsvColor(a / 100, h, s / 100, v / 100);
-        }
-
-        return BindingOperations.DoNothing;
-    }
-}

src/Semi.Avalonia.ColorPicker/Converters/ToColorModel.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Controls;
-using Avalonia.Data.Converters;
-
-namespace Semi.Avalonia.ColorPicker.Converters;
-
-public class ToColorModel : IValueConverter
-{
-    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        return parameter is "Hex" && value is "Hex" ||
-               parameter is "Rgba" && value is ColorModel.Rgba ||
-               parameter is "Hsva" && value is ColorModel.Hsva;
-    }
-
-    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
-}

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

@@ -4,7 +4,7 @@
 
     <PropertyGroup>
         <Title>Semi.Avalonia.ColorPicker</Title>
-        <PackageReleaseNotes>Update to Avalonia 11.1.0.2</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
     </PropertyGroup>
 
     <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">

src/Semi.Avalonia.ColorPicker/Shared.axaml

@@ -29,5 +29,4 @@
     <colorPicker:SemiColorDarkPalette x:Key="SemiColorPalette" />
     
     <PlacementMode x:Key="ColorPickerFlyoutPlacement">AnchorAndGravity</PlacementMode>
-    <PlacementMode x:Key="SimpleColorPickerFlyoutPlacement">BottomEdgeAlignedLeft</PlacementMode>
 </ResourceDictionary>

src/Semi.Avalonia.DataGrid/Dark.axaml

@@ -9,6 +9,7 @@
 
     <SolidColorBrush x:Key="DataGridColumnHeaderForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="DataGridColumnHeaderBackground" Color="Transparent" />
+
     <SolidColorBrush x:Key="DataGridColumnHeaderPointeroverBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackground" Opacity="0.20" Color="White" />
 

src/Semi.Avalonia.DataGrid/DataGrid.axaml

@@ -471,7 +471,6 @@
         <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="SelectionMode" Value="Extended" />
         <Setter Property="GridLinesVisibility" Value="None" />
-        <Setter Property="ScrollViewer.AllowAutoHide" Value="True" />
         <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource DataGridLineBrush}" />
         <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource DataGridLineBrush}" />
         <Setter Property="DropLocationIndicatorTemplate">
@@ -571,15 +570,5 @@
                 <Setter Property="IsVisible" Value="False" />
             </Style>
         </Style>
-
-        <Style Selector="^[(ScrollViewer.AllowAutoHide)=False]">
-            <Style Selector="^ /template/ DataGridRowsPresenter#PART_RowsPresenter">
-                <Setter Property="Grid.RowSpan" Value="1" />
-                <Setter Property="Grid.ColumnSpan" Value="2" />
-            </Style>
-            <Style Selector="^ /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
-                <Setter Property="Grid.ColumnSpan" Value="1" />
-            </Style>
-        </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia.DataGrid/Light.axaml

@@ -18,8 +18,9 @@
     <SolidColorBrush x:Key="DataGridDetailsPresenterBackground" Color="Transparent" />
 
     <SolidColorBrush x:Key="DataGridRowPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="DataGridRowSelectedBackground" Opacity="0.2" Color="#EAF5FF" />
+    <SolidColorBrush x:Key="DataGridRowSelectedBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="DataGridRowSelectedPointeroverBackground" Opacity="0.3" Color="#CBE7FE" />
+    <SolidColorBrush x:Key="DataGridRowSelectedPointeroverBackground" Color="#CBE7FE" />
+
     <SolidColorBrush x:Key="DataGridRowGroupHeaderExpandIconForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="DataGridRowGroupHeaderBackground" Opacity="0.05" Color="#2E3238" />
 

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 Avalonia 11.1.0.2</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
     </PropertyGroup>
 
     <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">

src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj

@@ -4,14 +4,14 @@
         <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
-        <PackageReleaseNotes>Update to Avalonia 11.1-rc1</PackageReleaseNotes>
+        <Version>11.0.10</Version>
         <Authors>IRIHI Technology Co., Ltd.</Authors>
         <Description>Avalonia Theme inspired by Semi Design.</Description>
         <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageIcon>irihi.png</PackageIcon>
         <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
-        <AvaloniaVersion>11.0.0</AvaloniaVersion>
+        <AvaloniaVersion>11.0.10</AvaloniaVersion>
     </PropertyGroup>
 
     <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">

src/Semi.Avalonia/Controls/AdornerLayer.axaml

@@ -5,8 +5,11 @@
     <ControlTheme x:Key="{x:Type AdornerLayer}" TargetType="AdornerLayer">
         <Setter Property="DefaultFocusAdorner">
             <FocusAdornerTemplate>
-                <Border BorderThickness="{DynamicResource AdornerLayerBorderThickness}"
+                <Rectangle
-                        BorderBrush="{DynamicResource AdornerLayerStroke}" />
+                    Margin="{DynamicResource AdornerLayerMargin}"
+                    Stroke="{DynamicResource AdornerLayerBackground}"
+                    StrokeDashArray="1,2"
+                    StrokeThickness="{DynamicResource AdornerLayerThickness}" />
             </FocusAdornerTemplate>
         </Setter>
     </ControlTheme>

src/Semi.Avalonia/Controls/AutoCompleteBox.axaml

@@ -9,8 +9,6 @@
         </StackPanel>
     </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox">
-        <Setter Property="AutoCompleteBox.VerticalAlignment" Value="Center" />
-        <Setter Property="AutoCompleteBox.MinHeight" Value="{DynamicResource AutoCompleteBoxDefaultHeight}" />
         <Setter Property="AutoCompleteBox.MaxDropDownHeight" Value="{DynamicResource AutoCompleteMaxDropdownHeight}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="AutoCompleteBox">
@@ -18,12 +16,9 @@
                     <Panel>
                         <TextBox
                             Name="PART_TextBox"
-                            VerticalAlignment="Stretch"
+                            VerticalAlignment="Center"
-                            MinHeight="{TemplateBinding MinHeight}"
                             DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                             Theme="{DynamicResource NonErrorTextBox}"
-                            InnerLeftContent="{TemplateBinding InnerLeftContent}"
-                            InnerRightContent="{TemplateBinding InnerRightContent}"
                             Watermark="{TemplateBinding Watermark}" />
                         <Popup
                             Name="PART_Popup"
@@ -58,8 +53,7 @@
                     <Panel>
                         <TextBox
                             Name="PART_TextBox"
-                            VerticalAlignment="Stretch"
+                            VerticalAlignment="Center"
-                            MinHeight="0"
                             Classes="Bordered"
                             DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                             Watermark="{TemplateBinding Watermark}" />
@@ -89,11 +83,15 @@
                 </ControlTemplate>
             </Setter>
         </Style>
-        <Style Selector="^.Large">
+        <Style Selector="^.Large /template/ TextBox">
             <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxLargeHeight}" />
         </Style>
-        <Style Selector="^.Small">
+        <Style Selector="^.Small /template/ TextBox">
             <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxSmallHeight}" />
         </Style>
     </ControlTheme>
+
+
+
+
 </ResourceDictionary>

src/Semi.Avalonia/Controls/Button.axaml

@@ -8,32 +8,28 @@
 
     <!--  Button Light  -->
     <ControlTheme x:Key="{x:Type Button}" TargetType="Button">
-        <Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
+        <Setter Property="Button.Background" Value="{DynamicResource ButtonDefaultBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+        <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
+        <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
+        <Setter Property="Button.CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
+        <Setter Property="Button.BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
-        <Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
+        <Setter Property="Button.Padding" Value="{DynamicResource ButtonDefaultPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Button.RenderTransform" Value="none" />
-        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Button.FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
-        <Setter Property="RenderTransform" Value="none" />
+        <Setter Property="Button.FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
-        <Setter Property="FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
+        <Setter Property="Button.HorizontalContentAlignment" Value="Center" />
-        <Setter Property="FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
+        <Setter Property="Button.VerticalContentAlignment" Value="Center" />
-        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
+        <Setter Property="Button.MinHeight" Value="12" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="Button.Cursor" Value="Hand" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Button.Template">
-        <Setter Property="MinHeight" Value="{DynamicResource ButtonDefaultHeight}" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Template">
             <ControlTemplate TargetType="Button">
                 <ContentPresenter
                     x:Name="PART_ContentPresenter"
                     Padding="{TemplateBinding Padding}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     Content="{TemplateBinding Content}"
                     ContentTemplate="{TemplateBinding ContentTemplate}"
@@ -49,11 +45,6 @@
             <Setter Property="RenderTransform" Value="scale(0.98)" />
         </Style>
 
-        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
-            <Setter Property="Background" Value="{TemplateBinding Background}" />
-        </Style>
-
         <Style Selector="^.Primary">
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
         </Style>
@@ -73,27 +64,25 @@
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
         </Style>
 
-        <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:pointerover">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
         </Style>
 
-        <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:pressed">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
 
-        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:disabled">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
         <Style Selector="^.Large">
-            <Setter Property="MinHeight" Value="{DynamicResource ButtonLargeHeight}" />
             <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="MinHeight" Value="{DynamicResource ButtonSmallHeight}" />
             <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
@@ -102,113 +91,99 @@
         x:Key="SolidButton"
         BasedOn="{StaticResource {x:Type Button}}"
         TargetType="Button">
-        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+        <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+        <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
-        </Style>
 
-        <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:pointerover">
             <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
         </Style>
-        <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:pressed">
             <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
         </Style>
 
         <Style Selector="^.Primary">
-            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Secondary">
-            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Tertiary">
-            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Success">
-            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Warning">
-            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Danger">
-            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
             </Style>
         </Style>
 
-        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:disabled">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
@@ -219,28 +194,26 @@
         x:Key="OutlineButton"
         BasedOn="{StaticResource {x:Type Button}}"
         TargetType="Button">
-        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
+        <Style Selector="^:pointerover">
-        </Style>
-        <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
         </Style>
-        <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:pressed">
             <Setter Property="Background" Value="{DynamicResource ButtonOutlinePressedBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
         </Style>
-        <Style Selector="^.Success /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^.Success">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineSuccessBorderBrush}" />
         </Style>
-        <Style Selector="^.Warning /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^.Warning">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineWarningBorderBrush}" />
         </Style>
-        <Style Selector="^.Danger /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^.Danger">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineDangerBorderBrush}" />
         </Style>
-        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:disabled">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
@@ -251,11 +224,9 @@
         x:Key="BorderlessButton"
         BasedOn="{StaticResource {x:Type Button}}"
         TargetType="Button">
-        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Button.Background" Value="Transparent" />
-            <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Button.BorderBrush" Value="Transparent" />
-            <Setter Property="BorderBrush" Value="Transparent" />
+        <Style Selector="^:disabled">
-        </Style>
-        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="BorderBrush" Value="Transparent" />
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
@@ -285,4 +256,4 @@
             <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerPressedForeground}" />
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/CalendarDatePicker.axaml

@@ -9,14 +9,12 @@
         <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}" />
         <Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThickness}" />
         <Setter Property="CornerRadius" Value="{DynamicResource CalendarDatePickerCornerRadius}" />
-        <Setter Property="BackgroundSizing" Value="OuterBorderEdge"/>
         <Setter Property="IsTodayHighlighted" Value="True" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="8 0" />
-        <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerDefaultHeight}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="CalendarDatePicker">
                 <DataValidationErrors>
@@ -26,116 +24,118 @@
                         VerticalAlignment="Stretch">
                         <Border
                             x:Name="Background"
-                            BackgroundSizing="{TemplateBinding BackgroundSizing}"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"/>
+                            CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid
+                            <Grid
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            ColumnDefinitions="*, Auto">
-                            <TextBox
-                                Name="PART_TextBox"
-                                Grid.Column="0"
-                                MinHeight="{TemplateBinding MinHeight}"
                                 HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
+                                VerticalAlignment="Center"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                ColumnDefinitions="*, Auto, Auto">
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                <TextBox
-                                Background="Transparent"
+                                    Name="PART_TextBox"
-                                BorderBrush="Transparent"
+                                    Grid.Column="0"
-                                BorderThickness="0"
+                                    Grid.ColumnSpan="2"
-                                CornerRadius="{TemplateBinding CornerRadius}"
+                                    MinHeight="{DynamicResource CalendarDatePickerDefaultHeight}"
-                                Foreground="{TemplateBinding Foreground}"
+                                    HorizontalAlignment="Stretch"
-                                Theme="{DynamicResource NonErrorTextBox}"
+                                    VerticalAlignment="Center"
-                                UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
+                                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                Watermark="{TemplateBinding Watermark}">
+                                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                <TextBox.Styles>
+                                    Background="Transparent"
-                                    <Style Selector="TextBox#PART_TextBox:pointerover /template/ Border#PART_ContentPresenterBorder">
+                                    BorderBrush="Transparent"
-                                        <!--  By default the TextBox has its own focused state, override this to disable it here  -->
+                                    BorderThickness="0"
-                                        <Setter Property="Background" Value="Transparent" />
+                                    CornerRadius="{TemplateBinding CornerRadius}"
-                                        <Setter Property="BorderBrush" Value="Transparent" />
+                                    Foreground="{TemplateBinding Foreground}"
-                                        <Setter Property="BorderThickness" Value="0" />
+                                    Theme="{DynamicResource NonErrorTextBox}"
-                                    </Style>
+                                    UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
-                                    <Style Selector="TextBox#PART_TextBox:focus /template/ Border#PART_ContentPresenterBorder">
+                                    Watermark="{TemplateBinding Watermark}">
-                                        <!--  By default the TextBox has its own focused state, override this to disable it here  -->
+                                    <TextBox.Styles>
-                                        <Setter Property="Background" Value="Transparent" />
+                                        <Style Selector="TextBox#PART_TextBox:pointerover /template/ Border#PART_ContentPresenterBorder">
-                                        <Setter Property="BorderBrush" Value="Transparent" />
+                                            <!--  By default the TextBox has its own focused state, override this to disable it here  -->
-                                        <Setter Property="BorderThickness" Value="0" />
-                                    </Style>
-                                    <Style Selector="TextBox#PART_TextBox:disabled">
-                                        <Style Selector="^ /template/ Border#PART_ContentPresenterBorder">
-                                            <!--  By default the TextBox has its own disabled state, override this to make the border background show through  -->
                                             <Setter Property="Background" Value="Transparent" />
                                             <Setter Property="BorderBrush" Value="Transparent" />
+                                            <Setter Property="BorderThickness" Value="0" />
                                         </Style>
-                                    </Style>
+                                        <Style Selector="TextBox#PART_TextBox:focus /template/ Border#PART_ContentPresenterBorder">
-                                </TextBox.Styles>
+                                            <!--  By default the TextBox has its own focused state, override this to disable it here  -->
-                            </TextBox>
+                                            <Setter Property="Background" Value="Transparent" />
-                            <Button
+                                            <Setter Property="BorderBrush" Value="Transparent" />
-                                Name="ClearButton"
+                                            <Setter Property="BorderThickness" Value="0" />
-                                Grid.Column="1"
+                                        </Style>
-                                Padding="0,0,8,0"
+                                        <Style Selector="TextBox#PART_TextBox:disabled">
-                                Content="{DynamicResource IconButtonClearData}"
+                                            <Style Selector="^ /template/ Border#PART_ContentPresenterBorder">
-                                Command="{Binding $parent[CalendarDatePicker].Clear}"
+                                                <!--  By default the TextBox has its own disabled state, override this to make the border background show through  -->
-                                Focusable="False"
+                                                <Setter Property="Background" Value="Transparent" />
-                                IsVisible="False"
+                                                <Setter Property="BorderBrush" Value="Transparent" />
-                                Theme="{DynamicResource InnerIconButton}" />
+                                            </Style>
-                            <Button
+                                        </Style>
-                                Name="PART_Button"
+                                    </TextBox.Styles>
-                                Grid.Column="1"
+                                </TextBox>
-                                Padding="0,0,8,0"
+                                <Button
-                                Content="{DynamicResource CalendarDatePickerIconGlyph}"
+                                    Name="ClearButton"
-                                Focusable="False"
+                                    Grid.Column="1"
-                                Theme="{DynamicResource InnerIconButton}" />
+                                    Padding="0,0,8,0"
-                            <Popup
+                                    Content="{DynamicResource IconButtonClearData}"
-                                Name="PART_Popup"
+                                    Command="{Binding $parent[CalendarDatePicker].Clear}"
-                                Grid.Column="0"
+                                    Focusable="False"
-                                HorizontalOffset="-8"
+                                    IsVisible="False"
-                                IsLightDismissEnabled="True"
+                                    Theme="{DynamicResource InnerIconButton}" />
-                                PlacementTarget="{TemplateBinding}"
+                                <Button
-                                VerticalOffset="-4">
+                                    Name="PART_Button"
-                                <Border
+                                    Grid.Column="2"
-                                    Margin="8"
+                                    Padding="0,0,8,0"
-                                    Background="Transparent"
+                                    Content="{DynamicResource CalendarDatePickerIconGlyph}"
-                                    BoxShadow="{DynamicResource CalendarDatePickerPopupBoxShadows}"
+                                    Focusable="False"
-                                    CornerRadius="{DynamicResource CalendarCornerRadius}">
+                                    Theme="{DynamicResource InnerIconButton}" />
-                                    <Calendar
+                                <Popup
-                                        Name="PART_Calendar"
+                                    Name="PART_Popup"
-                                        BorderThickness="0"
+                                    Grid.Column="0"
-                                        CornerRadius="{Binding $parent[Border].CornerRadius}"
+                                    HorizontalOffset="-8"
-                                        DisplayDate="{TemplateBinding DisplayDate}"
+                                    IsLightDismissEnabled="True"
-                                        DisplayDateEnd="{TemplateBinding DisplayDateEnd}"
+                                    PlacementTarget="{TemplateBinding}"
-                                        DisplayDateStart="{TemplateBinding DisplayDateStart}"
+                                    VerticalOffset="-4">
-                                        FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
+                                    <Border
-                                        IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
+                                        Margin="8"
-                                        SelectedDate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedDate, Mode=TwoWay}">
+                                        Background="Transparent"
-                                    </Calendar>
+                                        BoxShadow="{DynamicResource CalendarDatePickerPopupBoxShadows}"
-                                </Border>
+                                        CornerRadius="{DynamicResource CalendarCornerRadius}">
-                            </Popup>
+                                        <Calendar
-                        </Grid>
+                                            Name="PART_Calendar"
+                                            BorderThickness="0"
+                                            CornerRadius="{Binding $parent[Border].CornerRadius}"
+                                            DisplayDate="{TemplateBinding DisplayDate}"
+                                            DisplayDateEnd="{TemplateBinding DisplayDateEnd}"
+                                            DisplayDateStart="{TemplateBinding DisplayDateStart}"
+                                            FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
+                                            IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
+                                            SelectedDate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedDate, Mode=TwoWay}">
+                                        </Calendar>
+                                    </Border>
+                                </Popup>
+                            </Grid>
+                        </Border>
 
                     </Panel>
                 </DataValidationErrors>
 
             </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 Property="IsVisible" Value="{Binding $parent[CalendarDatePicker].SelectedDate, Converter={x:Static ObjectConverters.IsNotNull}}"></Setter>
-            </Style>
-            <Style Selector="^:pointerover /template/ Button#PART_Button">
-                <Setter Property="IsVisible" Value="{Binding $parent[CalendarDatePicker].SelectedDate, Converter={x:Static ObjectConverters.IsNull}}" />
             </Style>
         </Style>
 
         <Style Selector="^.Large">
-            <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerLargeHeight}" />
+            <Style Selector="^ /template/ TextBox#PART_TextBox">
+                <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerInnerLargeHeight}" />
+            </Style>
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerSmallHeight}" />
+            <Style Selector="^ /template/ TextBox#PART_TextBox">
+                <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerInnerSmallHeight}" />
+            </Style>
         </Style>
 
         <Style Selector="^:pointerover">

src/Semi.Avalonia/Controls/CheckBox.axaml

@@ -26,7 +26,6 @@
                     <Grid x:Name="RootGrid" ColumnDefinitions="Auto,*">
                         <Grid
                             Grid.Column="0"
-                            TemplatedControl.IsTemplateFocusTarget="True"
                             Margin="0,0,0,0"
                             VerticalAlignment="Center">
                             <Border

src/Semi.Avalonia/Controls/ComboBox.axaml

@@ -32,7 +32,6 @@
         <Setter Property="FocusAdorner" Value="{x:Null}" />
         <Setter Property="MaxDropDownHeight" Value="504" />
         <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
-        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
@@ -42,21 +41,20 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="MinHeight" Value="{DynamicResource ComboBoxDefaultHeight}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="ComboBox">
                 <DataValidationErrors>
-                    <Grid ColumnDefinitions="*, Auto">
+                    <Grid ColumnDefinitions="*, Auto, 32">
                         <Border
                             x:Name="Background"
                             Grid.Column="0"
-                            Grid.ColumnSpan="2"
+                            Grid.ColumnSpan="3"
+                            MinWidth="{DynamicResource ComboBoxThemeMinWidth}"
+                            MinHeight="{DynamicResource ComboBoxDefaultHeight}"
                             Background="{TemplateBinding Background}"
-                            BackgroundSizing="{TemplateBinding BackgroundSizing}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
-                            MinHeight="{TemplateBinding MinHeight}" />
                         <TextBlock
                             x:Name="PlaceholderTextBlock"
                             Grid.Column="0"
@@ -80,15 +78,13 @@
                         <Button
                             Name="ClearButton"
                             Grid.Column="1"
-                            Margin="0,0,8,0"
                             Command="{Binding $parent[ComboBox].Clear}"
                             Content="{DynamicResource IconButtonClearData}"
-                            Focusable="False"
                             IsVisible="False"
                             Theme="{DynamicResource InnerIconButton}" />
                         <Border
                             x:Name="DropDownOverlay"
-                            Grid.Column="1"
+                            Grid.Column="2"
                             Width="30"
                             Margin="0,1,1,1"
                             HorizontalAlignment="Right"
@@ -97,10 +93,12 @@
 
                         <PathIcon
                             x:Name="DropDownGlyph"
-                            Grid.Column="1"
+                            Grid.Column="2"
                             Width="12"
                             Height="12"
-                            Margin="0,0,12,0"
+                            Margin="0,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
                             Data="{DynamicResource ComboBoxIcon}"
                             Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
                             IsHitTestVisible="False"
@@ -148,15 +146,12 @@
             <Style Selector="^:pointerover /template/ Button#ClearButton">
                 <Setter Property="IsVisible" Value="{Binding $parent[ComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNotNull}}" />
             </Style>
-            <Style Selector="^:pointerover /template/ PathIcon#DropDownGlyph">
-                <Setter Property="IsVisible" Value="{Binding $parent[ComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}"/>
-            </Style>
         </Style>
 
-        <Style Selector="^.Large">
+        <Style Selector="^.Large /template/ Border#Background">
             <Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
         </Style>
-        <Style Selector="^.Small">
+        <Style Selector="^.Small /template/ Border#Background">
             <Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
         </Style>
 
@@ -164,18 +159,9 @@
         <Style Selector="^:pointerover">
             <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPointeroverBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorPointeroverBorderBrush}" />
-            <Style Selector="^ /template/ PathIcon#DropDownGlyph">
-                <Setter Property="Foreground" Value="{DynamicResource ComboBoxIconPointeroverForeground}" />
-            </Style>
         </Style>
-
+        <Style Selector="^:pointerover /template/ PathIcon#DropDownGlyph">
-        <!--  Focus State  -->
+            <Setter Property="Foreground" Value="{DynamicResource ComboBoxIconPointeroverForeground}" />
-        <Style Selector="^:focus">
-            <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorFocusBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorFocusBorderBrush}" />
-            <Style Selector="^ /template/ PathIcon#DropDownGlyph">
-                <Setter Property="Foreground" Value="{DynamicResource ComboBoxIconFocusForeground}" />
-            </Style>
         </Style>
 
         <!--  Pressed State  -->
@@ -236,10 +222,6 @@
                 <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBorderedPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderedPressedBorderBrush}" />
             </Style>
-            <Style Selector="^:focus /template/ Border#Background">
-                <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBorderedFocusBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderedFocusBorderBrush}" />
-            </Style>
             <Style Selector="^:disabled">
                 <Style Selector="^ /template/ Border#Background">
                     <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
@@ -302,10 +284,6 @@
             <Setter Property="Background" Value="{DynamicResource ComboBoxItemPointeroverBackground}" />
         </Style>
 
-        <Style Selector="^:focus /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource ComboBoxItemFocusBackground}" />
-        </Style>
-
         <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Background" Value="{DynamicResource ComboBoxItemDisabledBackground}" />
         </Style>
@@ -325,6 +303,5 @@
                 <Setter Property="Background" Value="{DynamicResource ComboBoxItemSelectedPointeroverBackground}" />
             </Style>
         </Style>
-
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/ContentControl.axaml

@@ -0,0 +1,22 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:CompileBindings="True">
+    <ControlTheme x:Key="{x:Type ContentControl}" TargetType="ContentControl">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="ContentControl">
+                <ContentPresenter
+                    Name="PART_ContentPresenter"
+                    Padding="{TemplateBinding Padding}"
+                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Content="{TemplateBinding Content}"
+                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                    CornerRadius="{TemplateBinding CornerRadius}" />
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/DatePicker.axaml

@@ -132,7 +132,6 @@
         <Setter Property="CornerRadius" Value="{DynamicResource DateTimePickerButtonCornerRadius}" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="DatePicker">
                 <DataValidationErrors>
@@ -146,7 +145,7 @@
                             Grid.ColumnSpan="2"
                             Width="298"
                             MinWidth="298"
-                            MinHeight="{TemplateBinding MinHeight}"
+                            MinHeight="{DynamicResource DateTimePickerButtonDefaultHeight}"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             Background="{TemplateBinding Background}"
@@ -166,45 +165,43 @@
                                     ColumnDefinitions="78*,Auto,132*,Auto,78*">
                                     <TextBlock
                                         Name="PART_DayTextBlock"
-                                        Padding="12,0"
+                                        Padding="12,4"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         FontFamily="{TemplateBinding FontFamily}"
                                         FontSize="{TemplateBinding FontSize}"
                                         FontWeight="{TemplateBinding FontWeight}"
-                                        Text="{DynamicResource STRING_DATEPICKER_DAY_TEXT}" />
+                                        Text="day" />
                                     <TextBlock
                                         Name="PART_MonthTextBlock"
-                                        Padding="12,0"
+                                        Padding="12,4"
                                         VerticalAlignment="Center"
                                         FontFamily="{TemplateBinding FontFamily}"
                                         FontSize="{TemplateBinding FontSize}"
                                         FontWeight="{TemplateBinding FontWeight}"
-                                        Text="{DynamicResource STRING_DATEPICKER_MONTH_TEXT}"
+                                        Text="month"
                                         TextAlignment="Left" />
                                     <TextBlock
                                         Name="PART_YearTextBlock"
-                                        Padding="12,0"
+                                        Padding="12,4"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         FontFamily="{TemplateBinding FontFamily}"
                                         FontSize="{TemplateBinding FontSize}"
                                         FontWeight="{TemplateBinding FontWeight}"
-                                        Text="{DynamicResource STRING_DATEPICKER_YEAR_TEXT}" />
+                                        Text="year" />
                                     <Rectangle
                                         x:Name="PART_FirstSpacer"
                                         Grid.Column="1"
                                         Width="1"
-                                        Height="{TemplateBinding Height}"
+                                        Margin="0,4"
-                                        MinHeight="{TemplateBinding MinHeight}"
                                         HorizontalAlignment="Center"
                                         Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
                                     <Rectangle
                                         x:Name="PART_SecondSpacer"
                                         Grid.Column="3"
                                         Width="1"
-                                        Height="{TemplateBinding Height}"
+                                        Margin="0,4"
-                                        MinHeight="{TemplateBinding MinHeight}"
                                         HorizontalAlignment="Center"
                                         Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
                                 </Grid>
@@ -258,10 +255,10 @@
         <Style Selector="^:hasnodate /template/ Button#PART_FlyoutButton TextBlock">
             <Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
         </Style>
-        <Style Selector="^.Large">
+        <Style Selector="^.Large /template/ Button#PART_FlyoutButton">
             <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonLargeHeight}" />
         </Style>
-        <Style Selector="^.Small">
+        <Style Selector="^.Small /template/ Button#PART_FlyoutButton">
             <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonSmallHeight}" />
         </Style>
     </ControlTheme>

src/Semi.Avalonia/Controls/DateTimePickerShared.axaml

@@ -6,8 +6,7 @@
 
     <ControlTheme x:Key="DateTimePickerFlyoutButton" TargetType="Button">
         <Setter Property="RenderTransform" Value="none" />
-        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
+        <Setter Property="Button.VerticalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="Template">
             <ControlTemplate>
                 <ContentPresenter
@@ -15,7 +14,6 @@
                     HorizontalContentAlignment="Stretch"
                     VerticalContentAlignment="Stretch"
                     Background="{TemplateBinding Background}"
-                    BackgroundSizing="{TemplateBinding BackgroundSizing}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     Content="{TemplateBinding Content}"

src/Semi.Avalonia/Controls/DropDownButton.axaml

@@ -4,29 +4,25 @@
     x:CompileBindings="True">
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type DropDownButton}" TargetType="DropDownButton">
-        <Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
+        <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonDefaultBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+        <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
+        <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
+        <Setter Property="DropDownButton.CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
+        <Setter Property="DropDownButton.BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
-        <Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
+        <Setter Property="DropDownButton.Padding" Value="{DynamicResource ButtonDefaultPadding}" />
-        <Setter Property="RenderTransform" Value="none" />
+        <Setter Property="DropDownButton.RenderTransform" Value="none" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="DropDownButton.FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
-        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="DropDownButton.FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
-        <Setter Property="FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
+        <Setter Property="DropDownButton.HorizontalContentAlignment" Value="Center" />
-        <Setter Property="FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
+        <Setter Property="DropDownButton.VerticalContentAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="DropDownButton.MinHeight" Value="12" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="DropDownButton.Cursor" Value="Hand" />
-        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
-        <Setter Property="MinHeight" Value="{DynamicResource ButtonDefaultHeight}" />
-        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Template">
             <ControlTemplate TargetType="DropDownButton">
                 <Border
                     x:Name="RootBorder"
-                    HorizontalAlignment="Stretch"
+                    Background="{TemplateBinding Background}"
-                    VerticalAlignment="Stretch"
+                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BackgroundSizing="{TemplateBinding BackgroundSizing}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     ClipToBounds="True"
                     CornerRadius="{TemplateBinding CornerRadius}">
@@ -39,7 +35,6 @@
                             VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                             Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Foreground="{TemplateBinding Foreground}"
                             RecognizesAccessKey="True" />
                         <PathIcon
                             x:Name="DropDownGlyph"
@@ -62,21 +57,6 @@
             <Setter Property="RenderTransform" Value="scale(0.98)" />
         </Style>
 
-        <Style Selector="^ /template/ Border#RootBorder">
-            <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
-            <Setter Property="Background" Value="{TemplateBinding Background}" />
-        </Style>
-
-        <Style Selector="^:pointerover /template/ Border#RootBorder">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
-        </Style>
-
-        <Style Selector="^:pressed /template/ Border#RootBorder">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
-        </Style>
-
         <Style Selector="^.Primary">
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
         </Style>
@@ -96,144 +76,165 @@
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
         </Style>
 
-        <Style Selector="^:pointerover /template/ Border#RootBorder">
+        <Style Selector="^:pointerover">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
         </Style>
 
-        <Style Selector="^:pressed /template/ Border#RootBorder">
+        <Style Selector="^:pressed">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
+
         <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
-        </Style>
-        <Style Selector="^:disabled /template/ Border#RootBorder">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
         <Style Selector="^.Large">
             <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
-            <Setter Property="MinHeight" Value="{DynamicResource ButtonLargeHeight}" />
         </Style>
         <Style Selector="^.Small">
             <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
-            <Setter Property="MinHeight" Value="{DynamicResource ButtonSmallHeight}" />
         </Style>
     </ControlTheme>
 
-    <ControlTheme
+    <ControlTheme x:Key="SolidDropDownButton" TargetType="DropDownButton">
-        x:Key="SolidDropDownButton"
+        <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-        BasedOn="{StaticResource {x:Type DropDownButton}}"
+        <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-        TargetType="DropDownButton">
+        <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+        <Setter Property="DropDownButton.CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
-        <Style Selector="^ /template/ Border#RootBorder">
+        <Setter Property="DropDownButton.BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+        <Setter Property="DropDownButton.Padding" Value="{DynamicResource ButtonDefaultPadding}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+        <Setter Property="DropDownButton.RenderTransform" Value="none" />
-        </Style>
+        <Setter Property="DropDownButton.FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
-        <Style Selector="^:pointerover /template/ Border#RootBorder">
+        <Setter Property="DropDownButton.FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+        <Setter Property="DropDownButton.HorizontalContentAlignment" Value="Center" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+        <Setter Property="DropDownButton.VerticalContentAlignment" Value="Center" />
-        </Style>
+        <Setter Property="DropDownButton.MinHeight" Value="12" />
-        <Style Selector="^:pressed /template/ Border#RootBorder">
+        <Setter Property="DropDownButton.Cursor" Value="Hand" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+        <Setter Property="Template">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+            <ControlTemplate TargetType="DropDownButton">
+                <Border
+                    x:Name="RootBorder"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    ClipToBounds="True"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <Grid x:Name="InnerGrid" ColumnDefinitions="*,Auto">
+                        <ContentPresenter
+                            x:Name="PART_ContentPresenter"
+                            Grid.Column="0"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            RecognizesAccessKey="True" />
+                        <PathIcon
+                            x:Name="DropDownGlyph"
+                            Grid.Column="1"
+                            Width="12"
+                            Height="12"
+                            Margin="0,0,8,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Data="{DynamicResource DropDownButtonIconGlyph}"
+                            Foreground="{TemplateBinding Foreground}"
+                            IsHitTestVisible="False"
+                            UseLayoutRounding="False" />
+                    </Grid>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:pressed">
+            <Setter Property="RenderTransform" Value="scale(0.98)" />
         </Style>
+
         <Style Selector="^.Primary">
             <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Style Selector="^ /template/ Border#RootBorder">
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ Border#RootBorder">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ Border#RootBorder">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Secondary">
             <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Style Selector="^ /template/ Border#RootBorder">
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ Border#RootBorder">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ Border#RootBorder">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Tertiary">
             <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Style Selector="^ /template/ Border#RootBorder">
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ Border#RootBorder">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ Border#RootBorder">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Success">
             <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Style Selector="^ /template/ Border#RootBorder">
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ Border#RootBorder">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ Border#RootBorder">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Warning">
             <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Style Selector="^ /template/ Border#RootBorder">
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ Border#RootBorder">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ Border#RootBorder">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Danger">
             <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Style Selector="^ /template/ Border#RootBorder">
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ Border#RootBorder">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ Border#RootBorder">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
             </Style>
         </Style>
-        <Style Selector="^:disabled /template/ Border#RootBorder">
+
+        <Style Selector="^:disabled">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
-        </Style>
-        <Style Selector="^:disabled">
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
@@ -242,32 +243,28 @@
         x:Key="OutlineDropDownButton"
         BasedOn="{StaticResource {x:Type DropDownButton}}"
         TargetType="DropDownButton">
-        <Style Selector="^ /template/ Border#RootBorder">
             <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-        </Style>
+        <Style Selector="^:pointerover">
-        <Style Selector="^:pointerover /template/ Border#RootBorder">
             <Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
         </Style>
-        <Style Selector="^:pressed /template/ Border#RootBorder">
+        <Style Selector="^:pressed">
             <Setter Property="Background" Value="{DynamicResource ButtonOutlinePressedBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
         </Style>
-        <Style Selector="^.Success /template/ Border#RootBorder">
+        <Style Selector="^.Success">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineSuccessBorderBrush}" />
         </Style>
-        <Style Selector="^.Warning /template/ Border#RootBorder">
+        <Style Selector="^.Warning">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineWarningBorderBrush}" />
         </Style>
-        <Style Selector="^.Danger /template/ Border#RootBorder">
+        <Style Selector="^.Danger">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineDangerBorderBrush}" />
         </Style>
-        <Style Selector="^:disabled /template/ Border#RootBorder">
+        <Style Selector="^:disabled">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
-        </Style>
-        <Style Selector="^:disabled">
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
@@ -276,13 +273,12 @@
         x:Key="BorderlessDropDownButton"
         BasedOn="{StaticResource {x:Type DropDownButton}}"
         TargetType="DropDownButton">
-        <Style Selector="^ /template/ Border#RootBorder">
+        <Setter Property="DropDownButton.Background" Value="Transparent" />
-            <Setter Property="Background" Value="Transparent" />
+        <Setter Property="DropDownButton.BorderBrush" Value="Transparent" />
-            <Setter Property="BorderBrush" Value="Transparent" />
+        <Style Selector="^:disabled">
-        </Style>
-        <Style Selector="^:disabled /template/ Border#RootBorder">
             <Setter Property="BorderBrush" Value="Transparent" />
             <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/Expander.axaml

@@ -23,7 +23,7 @@
         <Setter Property="Expander.BorderBrush" Value="{DynamicResource ExpanderSeparatorBorderBrush}" />
         <Setter Property="Expander.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Expander.HorizontalAlignment" Value="Stretch" />
-        <Setter Property="Expander.HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="Expander.HorizontalContentAlignment" Value="Left" />
         <Setter Property="Expander.VerticalContentAlignment" Value="Stretch" />
         <Setter Property="Expander.Template">
             <ControlTemplate TargetType="Expander">

src/Semi.Avalonia/Controls/HyperlinkButton.axaml

@@ -1,118 +0,0 @@
-<ResourceDictionary
-    x:CompileBindings="True"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme TargetType="HyperlinkButton" x:Key="{x:Type HyperlinkButton}">
-        <Setter Property="Padding" Value="0,0,0,0" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource HyperlinkButtonFontSize}" />
-        <Setter Property="MinHeight" Value="32" />
-        <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForeground}" />
-        <Setter Property="Background" Value="{DynamicResource HyperlinkButtonDefaultBackground}" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="HyperlinkButton">
-                <Grid ColumnDefinitions="Auto,*" x:Name="RootGrid">
-                    <Grid
-                        Grid.Column="0"
-                        IsVisible="False"
-                        Margin="0,0,8,0"
-                        VerticalAlignment="Center"
-                        x:Name="IconGrid">
-                        <Border
-                            Background="{DynamicResource HyperlinkButtonDefaultBackground}"
-                            Height="{DynamicResource HyperlinkButtonIconHeight}"
-                            Opacity="0"
-                            UseLayoutRounding="False"
-                            Width="{DynamicResource HyperlinkButtonIconWidth}"
-                            x:Name="BackgroundRectangle" />
-                        <PathIcon
-                            Data="{DynamicResource HyperlinkButtonLinkGlyph}"
-                            Foreground="{DynamicResource HyperlinkButtonForeground}"
-                            Height="{DynamicResource HyperlinkButtonLinkGlyphHeight}"
-                            Name="LinkGlyph"
-                            VerticalAlignment="Center"
-                            Width="{DynamicResource HyperlinkButtonLinkGlyphWidth}" />
-                    </Grid>
-                    <ContentPresenter
-                        Content="{TemplateBinding Content}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Cursor="{TemplateBinding Cursor}"
-                        Grid.Column="1"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        Padding="0,0,0,0"
-                        RecognizesAccessKey="True"
-                        VerticalAlignment="Center"
-                        x:Name="ContentPresenter" />
-                </Grid>
-            </ControlTemplate>
-        </Setter>
-
-        <Style Selector="^:pointerover">
-            <Style Selector="^ /template/ PathIcon#LinkGlyph">
-                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
-            </Style>
-            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
-            </Style>
-        </Style>
-
-        <!--  Unvisited Pressed State  -->
-        <Style Selector="^:pressed">
-            <Setter Property="RenderTransform" Value="scale(0.98)" />
-        </Style>
-
-        <!--  Unvisited Disabled state  -->
-        <Style Selector="^:disabled">
-            <Style Selector="^ /template/ PathIcon#LinkGlyph">
-                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
-            </Style>
-            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
-            </Style>
-        </Style>
-
-        <Style Selector="^:visited">
-            <Style Selector="^ /template/ PathIcon#LinkGlyph">
-                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonVisitedForeground}" />
-            </Style>
-            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonVisitedForeground}" />
-            </Style>
-
-            <!--  Visited Pointerover State  -->
-            <Style Selector="^:pointerover">
-                <Style Selector="^ /template/ PathIcon#LinkGlyph">
-                    <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
-                </Style>
-                <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-                    <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
-                </Style>
-            </Style>
-
-            <!--  Visited Pressed State  -->
-            <Style Selector="^:pressed">
-                <Setter Property="RenderTransform" Value="scale(0.98)" />
-            </Style>
-
-            <!--  Visited Disabled State  -->
-            <Style Selector="^:disabled">
-                <Style Selector="^ /template/ PathIcon#LinkGlyph">
-                    <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
-                </Style>
-                <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-                    <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
-                </Style>
-            </Style>
-        </Style>
-
-        <Style Selector="^.WithIcon">
-            <Style Selector="^ /template/ Grid#IconGrid">
-                <Setter Property="IsVisible" Value="True" />
-            </Style>
-        </Style>
-    </ControlTheme>
-</ResourceDictionary>

src/Semi.Avalonia/Controls/Menu.axaml

@@ -27,10 +27,10 @@
                         RenderTransform="{x:Null}">
                         <RepeatButton.IsVisible>
                             <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="0">
-                                <Binding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
-                                <Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
-                                <Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
-                                <Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
                             </MultiBinding>
                         </RepeatButton.IsVisible>
                         <PathIcon
@@ -50,10 +50,10 @@
                         RenderTransform="{x:Null}">
                         <RepeatButton.IsVisible>
                             <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="100">
-                                <Binding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
-                                <Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
-                                <Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
-                                <Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
                             </MultiBinding>
                         </RepeatButton.IsVisible>
                         <PathIcon
@@ -120,26 +120,14 @@
                         CornerRadius="{TemplateBinding CornerRadius}">
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" SharedSizeGroup="ToggleIcon" />
                                 <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIcon" />
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT" />
                                 <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemChevron" />
                             </Grid.ColumnDefinitions>
 
-                            <ContentControl
-                                Name="PART_ToggleIconPresenter"
-                                Grid.Column="0"
-                                Width="16"
-                                Height="16"
-                                Margin="{DynamicResource MenuItemIconMargin}"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                IsVisible="False" />
-
                             <Viewbox
                                 Name="PART_IconPresenter"
-                                Grid.Column="1"
                                 Width="16"
                                 Height="16"
                                 Margin="{DynamicResource MenuItemIconMargin}"
@@ -155,7 +143,7 @@
 
                             <ContentPresenter
                                 Name="PART_HeaderPresenter"
-                                Grid.Column="2"
+                                Grid.Column="1"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
                                 Content="{TemplateBinding Header}"
@@ -163,7 +151,7 @@
                                 RecognizesAccessKey="True" />
                             <TextBlock
                                 x:Name="PART_InputGestureText"
-                                Grid.Column="3"
+                                Grid.Column="2"
                                 Margin="{DynamicResource MenuItemInputGestureTextMargin}"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
@@ -172,7 +160,7 @@
                                                        Converter={StaticResource KeyGestureConverter}}" />
                             <PathIcon
                                 Name="PART_ExpandIcon"
-                                Grid.Column="4"
+                                Grid.Column="3"
                                 Width="8"
                                 Height="8"
                                 Margin="{DynamicResource MenuItemExpandIconMargin}"
@@ -257,27 +245,6 @@
                 </ControlTemplate>
             </Setter>
         </Style>
-
-        <Style Selector="^:checked:toggle /template/ ContentControl#PART_ToggleIconPresenter">
-            <Setter Property="IsVisible" Value="True" />
-            <Setter Property="Content">
-                <Template>
-                    <PathIcon
-                        Foreground="{Binding $parent[MenuItem].Foreground}"
-                        Data="{StaticResource MenuCheckGlyph}" />
-                </Template>
-            </Setter>
-        </Style>
-
-        <Style Selector="^:checked:radio /template/ ContentControl#PART_ToggleIconPresenter">
-            <Setter Property="IsVisible" Value="True" />
-            <Setter Property="Content">
-                <Template>
-                    <Ellipse Fill="{Binding $parent[MenuItem].Foreground}"
-                             Margin="4" Width="8" Height="8" />
-                </Template>
-            </Setter>
-        </Style>
     </ControlTheme>
 
     <ControlTheme x:Key="TopLevelMenuItem" TargetType="MenuItem">

src/Semi.Avalonia/Controls/NotificationCard.axaml

@@ -3,26 +3,15 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <Design.PreviewWith>
-        <ThemeVariantScope RequestedThemeVariant="Dark">
+        <NotificationCard>
-            <StackPanel>
+            <TextBlock Text="Hello World" />
-                <NotificationCard>
+        </NotificationCard>
-                    Hello, Semi.Avalonia!
-                </NotificationCard>
-                <NotificationCard NotificationType="Success">
-                    <Notification Title="Welcome" Message="Hello, Semi.Avalonia!" />
-                </NotificationCard>
-                <NotificationCard NotificationType="Warning">
-                    <Notification Title="" Message="Hello, Semi.Avalonia!" />
-                </NotificationCard>
-                <NotificationCard NotificationType="Error">
-                    <Notification Message="Hello, Semi.Avalonia!" />
-                </NotificationCard>
-            </StackPanel>
-        </ThemeVariantScope>
     </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type NotificationCard}" TargetType="NotificationCard">
         <Setter Property="UseLayoutRounding" Value="True" />
-        <Setter Property="MinWidth" Value="{DynamicResource NotificationCardMinWidth}" />
+        <Setter Property="MinWidth" Value="{DynamicResource NotificationCardWidth}" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Foreground" Value="{DynamicResource NotificationCardForeground}" />
         <Setter Property="RenderTransformOrigin" Value="50%,75%" />
         <Setter Property="BorderThickness" Value="{DynamicResource NotificationCardBorderThickness}" />
         <Setter Property="BorderBrush" Value="{DynamicResource NotificationCardBorderBrush}" />
@@ -32,50 +21,47 @@
             <ControlTemplate TargetType="NotificationCard">
                 <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
                     <Border
-                        Margin="{DynamicResource NotificationCardMargin}"
+                        Margin="8"
-                        Background="{TemplateBinding Background}"
+                        BoxShadow="{DynamicResource NotificationCardBoxShadows}"
                         CornerRadius="{TemplateBinding CornerRadius}">
                         <Border
-                            x:Name="PART_RootBorder"
+                            Background="{TemplateBinding Background}"
-                            Padding="{DynamicResource NotificationCardPadding}"
-                            BoxShadow="{DynamicResource NotificationCardBoxShadow}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
+                            ClipToBounds="True"
                             CornerRadius="{TemplateBinding CornerRadius}">
                             <DockPanel>
                                 <PathIcon
                                     Name="NotificationIcon"
-                                    Width="{DynamicResource NotificationCardIconWidth}"
+                                    Width="16"
-                                    Height="{DynamicResource NotificationCardIconHeight}"
+                                    Height="16"
-                                    Margin="{DynamicResource NotificationCardIconMargin}"
+                                    Margin="16,16,12,0"
                                     VerticalAlignment="Top"
                                     IsVisible="False"
-                                    Data="{DynamicResource NotificationCardInformationIconPathData}" />
+                                    Data="{DynamicResource NotificationCardInformationIconPathData}"/>
                                 <ContentControl
                                     Name="PART_Content"
+                                    MinHeight="64"
                                     Content="{TemplateBinding Content}">
                                     <ContentControl.DataTemplates>
                                         <DataTemplate DataType="INotification">
-                                            <StackPanel Spacing="{DynamicResource NotificationCardTitleSpacing}">
+                                            <StackPanel Margin="0,8,8,8" Spacing="8">
-                                                <SelectableTextBlock
+                                                <TextBlock
-                                                    Foreground="{DynamicResource NotificationCardTitleForeground}"
+                                                    FontSize="16"
-                                                    FontSize="{DynamicResource NotificationCardTitleFontSize}"
+                                                    FontWeight="600"
-                                                    FontWeight="{DynamicResource NotificationCardTitleFontWeight}"
-                                                    IsVisible="{Binding Title, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                                                     Text="{Binding Title}" />
-                                                <SelectableTextBlock
+                                                <TextBlock
-                                                    Foreground="{DynamicResource NotificationCardMessageForeground}"
+                                                    MaxHeight="80"
-                                                    FontSize="{DynamicResource NotificationCardMessageFontSize}"
+                                                    Margin="0,0,8,0"
-                                                    FontWeight="{DynamicResource NotificationCardMessageFontWeight}"
+                                                    FontSize="14"
+                                                    FontWeight="400"
                                                     Text="{Binding Message}"
                                                     TextWrapping="Wrap" />
                                             </StackPanel>
                                         </DataTemplate>
                                         <DataTemplate DataType="x:String">
-                                            <SelectableTextBlock
+                                            <TextBlock
-                                                Foreground="{DynamicResource NotificationCardMessageForeground}"
+                                                Margin="12"
-                                                FontSize="{DynamicResource NotificationCardMessageFontSize}"
-                                                FontWeight="{DynamicResource NotificationCardMessageFontWeight}"
                                                 Text="{Binding}"
                                                 TextWrapping="Wrap" />
                                         </DataTemplate>
@@ -167,25 +153,5 @@
             <Setter Property="Foreground" Value="{DynamicResource NotificationCardErrorIconForeground}" />
             <Setter Property="Data" Value="{DynamicResource NotificationCardErrorIconPathData}" />
         </Style>
-
-        <Style Selector="^.Light">
-            <Setter Property="Background" Value="{DynamicResource SemiColorBackground0}" />
-            <Style Selector="^:information /template/ Border#PART_RootBorder">
-                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorInformation}" />
-                <Setter Property="Background" Value="{DynamicResource SemiColorInformationLight}" />
-            </Style>
-            <Style Selector="^:success /template/ Border#PART_RootBorder">
-                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorSuccess}" />
-                <Setter Property="Background" Value="{DynamicResource SemiColorSuccessLight}" />
-            </Style>
-            <Style Selector="^:warning /template/ Border#PART_RootBorder">
-                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorWarning}" />
-                <Setter Property="Background" Value="{DynamicResource SemiColorWarningLight}" />
-            </Style>
-            <Style Selector="^:error /template/ Border#PART_RootBorder">
-                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorDanger}" />
-                <Setter Property="Background" Value="{DynamicResource SemiColorDangerLight}" />
-            </Style>
-        </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/NumericUpDown.axaml

@@ -4,10 +4,8 @@
     x:CompileBindings="True">
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown">
-        <Setter Property="NumericUpDown.VerticalAlignment" Value="Center" />
         <Setter Property="NumericUpDown.VerticalContentAlignment" Value="Center" />
         <Setter Property="NumericUpDown.CornerRadius" Value="{DynamicResource NumericUpDownCornerRadius}" />
-        <Setter Property="NumericUpDown.MinHeight" Value="{DynamicResource NumericUpDownDefaultHeight}" />
         <Setter Property="NumericUpDown.Template">
             <ControlTemplate TargetType="NumericUpDown">
                 <DataValidationErrors>
@@ -25,32 +23,29 @@
                         <TextBox
                             Name="PART_TextBox"
                             Height="{TemplateBinding Height}"
-                            MinHeight="{TemplateBinding MinHeight}"
+                            MinHeight="{DynamicResource NumericUpDownWrapperDefaultHeight}"
-                            VerticalAlignment="Stretch"
                             HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                             AcceptsReturn="False"
                             CornerRadius="{TemplateBinding CornerRadius}"
-                            DataValidationErrors.Errors="{Binding $parent[NumericUpDown].(DataValidationErrors.Errors)}"
+                            DataValidationErrors.Errors="{ReflectionBinding $parent[NumericUpDown].(DataValidationErrors.Errors)}"
                             FontSize="{TemplateBinding FontSize}"
                             Foreground="{TemplateBinding Foreground}"
                             IsReadOnly="{TemplateBinding IsReadOnly}"
                             Text="{TemplateBinding Text}"
                             TextWrapping="NoWrap"
                             Theme="{DynamicResource NonErrorTextBox}"
-                            InnerLeftContent="{TemplateBinding InnerLeftContent}"
-                            InnerRightContent="{TemplateBinding InnerRightContent}"
                             Watermark="{TemplateBinding Watermark}" />
                     </ButtonSpinner>
                 </DataValidationErrors>
             </ControlTemplate>
         </Setter>
 
-        <Style Selector="^.Large">
+        <Style Selector="^.Large /template/ TextBox#PART_TextBox">
-            <Setter Property="MinHeight" Value="{DynamicResource NumericUpDownLargeHeight}" />
+            <Setter Property="MinHeight" Value="{DynamicResource NumericUpDownWrapperLargeHeight}" />
         </Style>
-        <Style Selector="^.Small">
+        <Style Selector="^.Small /template/ TextBox#PART_TextBox">
-            <Setter Property="MinHeight" Value="{DynamicResource NumericUpDownSmallHeight}" />
+            <Setter Property="MinHeight" Value="{DynamicResource NumericUpDownWrapperSmallHeight}" />
         </Style>
 
         <Style Selector="^:error">

src/Semi.Avalonia/Controls/ProgressBar.axaml

@@ -159,7 +159,7 @@
                             <TextBlock.Text>
                                 <MultiBinding Converter="{StaticResource StringFormatConverter}">
                                     <TemplateBinding Property="ProgressTextFormat" />
-                                    <Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <ReflectionBinding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
                                     <TemplateBinding Property="Percentage" />
                                     <TemplateBinding Property="Minimum" />
                                     <TemplateBinding Property="Maximum" />

src/Semi.Avalonia/Controls/RadioButton.axaml

@@ -39,11 +39,7 @@
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}">
                     <Grid ColumnDefinitions="Auto,*">
-                        <Grid
+                        <Grid Margin="{DynamicResource RadioButtonIconMargin}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                            Grid.Column="0"
-                            TemplatedControl.IsTemplateFocusTarget="True"
-                            Margin="{DynamicResource RadioButtonIconMargin}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                             <Ellipse
                                 Name="OuterEllipse"
                                 Width="{DynamicResource RadioButtonIconRadius}"

src/Semi.Avalonia/Controls/RefreshContainer.axaml

@@ -28,27 +28,21 @@
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="IsHitTestVisible" Value="False" />
         <Setter Property="Height" Value="100" />
-        <Setter Property="Background" Value="{DynamicResource RefreshVisualizerIconBackground}" />
+        <Setter Property="Background" Value="{DynamicResource RefreshContainerIconBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource RefreshVisualizerIconForeground}" />
+        <Setter Property="Foreground" Value="{DynamicResource RefreshContainerIconForeground}" />
-        <Setter Property="Content">
-            <Template>
-                <Arc
-                    Name="PART_Icon"
-                    Width="{DynamicResource RefreshVisualizerIconSize}"
-                    Height="{DynamicResource RefreshVisualizerIconSize}"
-                    StartAngle="0"
-                    Stroke="{DynamicResource RefreshVisualizerIconForeground}"
-                    StrokeThickness="3"
-                    StrokeLineCap="Round"
-                    SweepAngle="270" />
-            </Template>
-        </Setter>
         <Setter Property="Template">
             <ControlTemplate>
-                <Grid Name="PART_Root"
+                <Grid
-                      MinHeight="80"
+                    Name="PART_Root"
-                      Background="{TemplateBinding Background}" />
+                    MinHeight="80"
+                    Background="{TemplateBinding Background}">
+                    <Grid.Styles>
+                        <Style Selector="PathIcon#PART_Icon">
+                            <Setter Property="Data" Value="{DynamicResource RefreshContainerIconGlyph}" />
+                        </Style>
+                    </Grid.Styles>
+                </Grid>
             </ControlTemplate>
         </Setter>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/RepeatButton.axaml

@@ -3,32 +3,28 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <ControlTheme x:Key="{x:Type RepeatButton}" TargetType="RepeatButton">
-        <Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
+        <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonDefaultBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+        <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
+        <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
+        <Setter Property="RepeatButton.CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
+        <Setter Property="RepeatButton.BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
-        <Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
+        <Setter Property="RepeatButton.Padding" Value="{DynamicResource ButtonDefaultPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="RepeatButton.RenderTransform" Value="none" />
-        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="RepeatButton.FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
-        <Setter Property="RenderTransform" Value="none" />
+        <Setter Property="RepeatButton.FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
-        <Setter Property="FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
+        <Setter Property="RepeatButton.HorizontalContentAlignment" Value="Center" />
-        <Setter Property="FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
+        <Setter Property="RepeatButton.VerticalContentAlignment" Value="Center" />
-        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
+        <Setter Property="RepeatButton.MinHeight" Value="12" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="RepeatButton.Cursor" Value="Hand" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="RepeatButton.Template">
-        <Setter Property="MinHeight" Value="{DynamicResource ButtonDefaultHeight}" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Template">
             <ControlTemplate TargetType="RepeatButton">
                 <ContentPresenter
                     x:Name="PART_ContentPresenter"
                     Padding="{TemplateBinding Padding}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     Content="{TemplateBinding Content}"
                     ContentTemplate="{TemplateBinding ContentTemplate}"
@@ -44,11 +40,6 @@
             <Setter Property="RenderTransform" Value="scale(0.98)" />
         </Style>
 
-        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
-            <Setter Property="Background" Value="{TemplateBinding Background}" />
-        </Style>
-
         <Style Selector="^.Primary">
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
         </Style>
@@ -68,27 +59,25 @@
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
         </Style>
 
-        <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:pointerover">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
         </Style>
 
-        <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:pressed">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
 
-        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:disabled">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
         <Style Selector="^.Large">
-            <Setter Property="MinHeight" Value="{DynamicResource ButtonLargeHeight}" />
             <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="MinHeight" Value="{DynamicResource ButtonSmallHeight}" />
             <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
@@ -97,113 +86,90 @@
         x:Key="SolidRepeatButton"
         BasedOn="{StaticResource {x:Type RepeatButton}}"
         TargetType="RepeatButton">
-        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+        <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+        <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}" />
-        </Style>
+            <Style Selector="^:pointerover">
-
-        <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
-        </Style>
-        <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
-        </Style>
-
-        <Style Selector="^.Primary">
-            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
-            </Style>
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Secondary">
-            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Tertiary">
-            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Success">
-            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Warning">
-            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Danger">
-            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
-                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
+            <Style Selector="^:pointerover">
-            </Style>
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
             </Style>
         </Style>
 
-        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:disabled">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
@@ -214,28 +180,26 @@
         x:Key="OutlineRepeatButton"
         BasedOn="{StaticResource {x:Type RepeatButton}}"
         TargetType="RepeatButton">
-        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
+        <Style Selector="^:pointerover">
-        </Style>
-        <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
         </Style>
-        <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:pressed">
             <Setter Property="Background" Value="{DynamicResource ButtonOutlinePressedBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
         </Style>
-        <Style Selector="^.Success /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^.Success">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineSuccessBorderBrush}" />
         </Style>
-        <Style Selector="^.Warning /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^.Warning">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineWarningBorderBrush}" />
         </Style>
-        <Style Selector="^.Danger /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^.Danger">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineDangerBorderBrush}" />
         </Style>
-        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:disabled">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
@@ -246,11 +210,9 @@
         x:Key="BorderlessRepeatButton"
         BasedOn="{StaticResource {x:Type RepeatButton}}"
         TargetType="RepeatButton">
-        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="RepeatButton.Background" Value="Transparent" />
-            <Setter Property="Background" Value="Transparent" />
+        <Setter Property="RepeatButton.BorderBrush" Value="Transparent" />
-            <Setter Property="BorderBrush" Value="Transparent" />
+        <Style Selector="^:disabled">
-        </Style>
-        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="BorderBrush" Value="Transparent" />
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />

src/Semi.Avalonia/Controls/ScrollViewer.axaml

@@ -319,10 +319,10 @@
                         DockPanel.Dock="Top">
                         <RepeatButton.IsVisible>
                             <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="0">
-                                <Binding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
-                                <Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
-                                <Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
-                                <Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
                             </MultiBinding>
                         </RepeatButton.IsVisible>
                         <Path Data="M 0 4 L 8 4 L 4 0 Z" />
@@ -334,10 +334,10 @@
                         DockPanel.Dock="Bottom">
                         <RepeatButton.IsVisible>
                             <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="100">
-                                <Binding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
-                                <Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
-                                <Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
-                                <Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <ReflectionBinding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
                             </MultiBinding>
                         </RepeatButton.IsVisible>
                         <Path Data="M 0 0 L 4 4 L 8 0 Z" />

src/Semi.Avalonia/Controls/SelectableTextBlock.axaml

@@ -17,7 +17,6 @@
         <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockFontSize}" />
         <Setter Property="SelectableTextBlock.Cursor" Value="Ibeam" />
         <Setter Property="SelectableTextBlock.SelectionBrush" Value="{DynamicResource TextBlockSelectionBackground}" />
-        <Setter Property="SelectableTextBlock.SelectionForegroundBrush" Value="{DynamicResource TextBlockSelectionForeground}" />
         <Style Selector="^.Secondary">
             <Setter Property="Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
         </Style>

src/Semi.Avalonia/Controls/SplitButton.axaml

@@ -2,135 +2,79 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <Design.PreviewWith>
-        <StackPanel Margin="20">
-            <SplitButton>Hello</SplitButton>
-        </StackPanel>
-    </Design.PreviewWith>
-
-    <ControlTheme x:Key="SemiSplitButtonElement" TargetType="Button">
-        <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
-        <Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="RenderTransform" Value="none" />
-        <Setter Property="FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
-        <Setter Property="FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
-        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="Button">
-                <ContentPresenter
-                    x:Name="PART_ContentPresenter"
-                    Padding="{TemplateBinding Padding}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Background="{TemplateBinding Background}"
-                    BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    RecognizesAccessKey="True"
-                    TextElement.FontSize="{TemplateBinding FontSize}"
-                    TextElement.FontWeight="{TemplateBinding FontWeight}"
-                    UseLayoutRounding="False" />
-            </ControlTemplate>
-        </Setter>
-    </ControlTheme>
 
     <ControlTheme x:Key="{x:Type SplitButton}" TargetType="SplitButton">
-        <Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
+        <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonDefaultBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+        <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
+        <Setter Property="SplitButton.BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
+        <Setter Property="SplitButton.CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
+        <Setter Property="SplitButton.BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
-        <Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
+        <Setter Property="SplitButton.Padding" Value="{DynamicResource ButtonDefaultPadding}" />
-        <Setter Property="RenderTransform" Value="none" />
+        <Setter Property="SplitButton.RenderTransform" Value="none" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="SplitButton.FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
-        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="SplitButton.FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
-        <Setter Property="FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
+        <Setter Property="SplitButton.HorizontalContentAlignment" Value="Center" />
-        <Setter Property="FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
+        <Setter Property="SplitButton.VerticalContentAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="SplitButton.MinHeight" Value="12" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="MinHeight" Value="{DynamicResource ButtonDefaultHeight}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="SplitButton">
-                <Border
+                <Grid ColumnDefinitions="*,Auto,Auto">
-                    BackgroundSizing="OuterBorderEdge"
+                    <Button
-                    ClipToBounds="True"
+                        x:Name="PART_PrimaryButton"
-                    CornerRadius="{TemplateBinding CornerRadius}">
+                        Grid.Column="0"
-                    <DockPanel>
+                        Padding="{TemplateBinding Padding}"
-                        <Button
+                        HorizontalAlignment="Stretch"
-                            x:Name="PART_SecondaryButton"
+                        VerticalAlignment="Stretch"
-                            Padding="4,0"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="Stretch"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            HorizontalContentAlignment="Center"
+                        Background="{TemplateBinding Background}"
-                            VerticalContentAlignment="Center"
+                        BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="0"
+                        Command="{TemplateBinding Command}"
-                            DockPanel.Dock="Right"
+                        CommandParameter="{TemplateBinding CommandParameter}"
-                            Focusable="False"
+                        Content="{TemplateBinding Content}"
-                            KeyboardNavigation.IsTabStop="False"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Theme="{DynamicResource SemiSplitButtonElement}">
+                        CornerRadius="3 0 0 3"
-                            <PathIcon
+                        Focusable="False"
-                                Width="12"
+                        FontFamily="{TemplateBinding FontFamily}"
-                                Height="12"
+                        FontSize="{TemplateBinding FontSize}"
-                                Data="{DynamicResource SplitButtonIconGlyph}"
+                        FontWeight="{TemplateBinding FontWeight}"
-                                Foreground="{Binding $parent[Button].Foreground}" />
+                        Foreground="{TemplateBinding Foreground}"
-                        </Button>
+                        KeyboardNavigation.IsTabStop="False" />
-                        <Rectangle
+
-                            x:Name="SeparatorBorder"
+                    <Border
-                            Width="{DynamicResource SplitButtonSeparatorWidth}"
+                        x:Name="SeparatorBorder"
-                            VerticalAlignment="Stretch"
+                        Grid.Column="1"
-                            DockPanel.Dock="Right"
+                        Width="{DynamicResource SplitButtonSeparatorWidth}"
-                            Fill="{TemplateBinding BorderBrush}"
+                        Background="Transparent"
-                            StrokeThickness="0" />
+                        BorderBrush="{TemplateBinding BorderBrush}"
-                        <Button
+                        BorderThickness="0.5" />
-                            x:Name="PART_PrimaryButton"
+
-                            Padding="{TemplateBinding Padding}"
+                    <Button
-                            HorizontalAlignment="Stretch"
+                        x:Name="PART_SecondaryButton"
-                            VerticalAlignment="Stretch"
+                        Grid.Column="2"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        Padding="4,0"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        HorizontalAlignment="Stretch"
-                            BorderThickness="{TemplateBinding BorderThickness}"
+                        VerticalAlignment="Stretch"
-                            Command="{TemplateBinding Command}"
+                        HorizontalContentAlignment="Center"
-                            CommandParameter="{TemplateBinding CommandParameter}"
+                        VerticalContentAlignment="Center"
-                            Content="{TemplateBinding Content}"
+                        Background="{TemplateBinding Background}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
-                            CornerRadius="0"
+                        BorderThickness="{TemplateBinding BorderThickness}"
-                            Focusable="False"
+                        CornerRadius="0 3 3 0"
-                            FontFamily="{TemplateBinding FontFamily}"
+                        Focusable="False"
-                            FontSize="{TemplateBinding FontSize}"
+                        Foreground="{TemplateBinding Foreground}"
-                            FontWeight="{TemplateBinding FontWeight}"
+                        KeyboardNavigation.IsTabStop="False">
-                            KeyboardNavigation.IsTabStop="False"
+                        <PathIcon
-                            Theme="{DynamicResource SemiSplitButtonElement}" />
+                            Width="12"
-                    </DockPanel>
+                            Height="12"
-                </Border>
+                            Data="{DynamicResource SplitButtonIconGlyph}"
+                            Foreground="{Binding $parent[Button].Foreground}" />
+                    </Button>
+                </Grid>
             </ControlTemplate>
         </Setter>
 
-        <Style Selector="^ /template/ Button">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
-            <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
-            </Style>
-            <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
-            </Style>
-        </Style>
-
 
         <Style Selector="^.Secondary /template/ Button">
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
@@ -151,74 +95,35 @@
             <Style Selector="^ /template/ Button">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
                 <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                <Style Selector="^:pointerover">
-                    <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-                </Style>
-                <Style Selector="^:pressed">
-                    <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-                </Style>
             </Style>
-
             <Style Selector="^.Secondary /template/ Button">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
-                <Style Selector="^:pointerover">
+                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                    <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
-                </Style>
-                <Style Selector="^:pressed">
-                    <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
-                </Style>
             </Style>
             <Style Selector="^.Tertiary /template/ Button">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
-                <Style Selector="^:pointerover">
+                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                    <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
-                </Style>
-                <Style Selector="^:pressed">
-                    <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
-                </Style>
             </Style>
             <Style Selector="^.Success /template/ Button">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
-                <Style Selector="^:pointerover">
+                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                    <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
-                </Style>
-                <Style Selector="^:pressed">
-                    <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
-                </Style>
             </Style>
             <Style Selector="^.Warning /template/ Button">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
-                <Style Selector="^:pointerover">
+                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                    <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
-                </Style>
-                <Style Selector="^:pressed">
-                    <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
-                </Style>
             </Style>
             <Style Selector="^.Danger /template/ Button">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
-                <Style Selector="^:pointerover">
+                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-                    <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
-                </Style>
-                <Style Selector="^:pressed">
-                    <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
-                </Style>
             </Style>
         </Style>
-        <Style Selector="^.Large /template/ Button#PART_PrimaryButton">
+        <Style Selector="^.Large /template/ Button">
             <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
         </Style>
-        <Style Selector="^.Large">
+        <Style Selector="^.Small /template/ Button">
-            <Setter Property="MinHeight" Value="{DynamicResource ButtonLargeHeight}" />
-        </Style>
-        <Style Selector="^.Small /template/ Button#PART_PrimaryButton">
             <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
-        <Style Selector="^.Small">
-            <Setter Property="MinHeight" Value="{DynamicResource ButtonSmallHeight}" />
-        </Style>
         <Style Selector="^:disabled /template/ Button">
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
         <!-- only for ToggleSplitButton -->
@@ -231,10 +136,9 @@
         x:Key="SolidSplitButton"
         BasedOn="{StaticResource {x:Type SplitButton}}"
         TargetType="SplitButton">
+        <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+        <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
         <Style Selector="^ /template/ Button">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-
             <Style Selector="^:pointerover">
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
             </Style>
@@ -314,9 +218,9 @@
         x:Key="OutlineSplitButton"
         BasedOn="{StaticResource {x:Type SplitButton}}"
         TargetType="SplitButton">
+        <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
         <Style Selector="^ /template/ Button">
-            <Setter Property="Background" Value="{DynamicResource ButtonOutlineBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonOutlineBorderBrush}" />
             <Style Selector="^:pointerover">
                 <Setter Property="Background" Value="{DynamicResource ButtonOutlinePointeroverBackground}" />
             </Style>
@@ -344,14 +248,12 @@
         x:Key="BorderlessSplitButton"
         BasedOn="{StaticResource {x:Type SplitButton}}"
         TargetType="SplitButton">
-        <Style Selector="^ /template/ Button">
+        <Setter Property="SplitButton.Background" Value="Transparent" />
-            <Setter Property="Background" Value="Transparent" />
+        <Setter Property="SplitButton.BorderBrush" Value="Transparent" />
-            <Setter Property="BorderBrush" Value="Transparent" />
-        </Style>
         <Style Selector="^:disabled /template/ Button">
             <Setter Property="BorderBrush" Value="Transparent" />
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/SplitView.axaml

@@ -129,7 +129,7 @@
                                 x:Name="PART_ContentPresenter"
                                 Content="{TemplateBinding Content}"
                                 ContentTemplate="{TemplateBinding ContentTemplate}" />
-                            <Rectangle Name="LightDismissLayer" IsVisible="False" />
+                            <Rectangle Name="LightDismissLayer" />
                         </Panel>
 
                     </Grid>
@@ -235,8 +235,8 @@
             </Style>
         </Style>
 
-        <Style Selector="^:lightDismiss /template/ Rectangle#LightDismissLayer">
+        <Style Selector="^:lightdismiss /template/ Rectangle#LightDismissLayer">
-            <Setter Property="Fill" Value="{DynamicResource SplitViewMaskBrush}" />
+            <Setter Property="Fill" Value="#99000000" />
         </Style>
         <Style Selector="^:overlay:open /template/ Rectangle#LightDismissLayer">
             <Setter Property="IsVisible" Value="True" />

src/Semi.Avalonia/Controls/TextBox.axaml

@@ -26,7 +26,7 @@
     <ControlTheme x:Key="{x:Type TextBox}" TargetType="TextBox">
         <ControlTheme.Resources>
             <ControlTheme x:Key="InputToggleButton" TargetType="ToggleButton">
-                <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ButtonInputInnerForeground}" />
+                <Setter Property="ToggleButton.Foreground" Value="{DynamicResource TextBoxButtonDefaultForeground}" />
                 <Setter Property="ToggleButton.Cursor" Value="Hand" />
                 <Setter Property="ToggleButton.Template">
                     <ControlTemplate TargetType="ToggleButton">
@@ -45,12 +45,6 @@
                         </Panel>
                     </ControlTemplate>
                 </Setter>
-                <Style Selector="^:pointerover">
-                    <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerPointeroverForeground}" />
-                </Style>
-                <Style Selector="^:pressed">
-                    <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerPressedForeground}" />
-                </Style>
             </ControlTheme>
         </ControlTheme.Resources>
         <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" />
@@ -59,14 +53,11 @@
         <Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
         <Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
         <Setter Property="TextBox.BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
-        <Setter Property="TextBox.BackgroundSizing" Value="OuterBorderEdge" />
         <Setter Property="TextBox.CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
         <Setter Property="TextBox.FontSize" Value="14" />
         <Setter Property="TextBox.Cursor" Value="Ibeam" />
         <Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
         <Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
-        <Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
-        <Setter Property="TextBox.VerticalAlignment" Value="Center" />
         <Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
         <Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
         <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
@@ -76,9 +67,8 @@
                 <DataValidationErrors>
                     <Border
                         Name="PART_ContentPresenterBorder"
-                        MinHeight="{TemplateBinding MinHeight}"
+                        MinHeight="{DynamicResource TextBoxWrapperDefaultHeight}"
                         Background="{TemplateBinding Background}"
-                        BackgroundSizing="{TemplateBinding BackgroundSizing}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}">
@@ -115,7 +105,6 @@
                                     <TextPresenter
                                         Name="PART_TextPresenter"
                                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
                                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                         CaretBrush="{TemplateBinding CaretBrush}"
                                         CaretIndex="{TemplateBinding CaretIndex}"
@@ -209,11 +198,11 @@
                 <Setter Property="IsVisible" Value="True" />
             </Style>
         </Style>
-        <Style Selector="^.Large">
+        <Style Selector="^.Large /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="MinHeight" Value="{DynamicResource TextBoxLargeHeight}" />
+            <Setter Property="MinHeight" Value="{DynamicResource TextBoxWrapperLargeHeight}" />
         </Style>
-        <Style Selector="^.Small">
+        <Style Selector="^.Small /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="MinHeight" Value="{DynamicResource TextBoxSmallHeight}" />
+            <Setter Property="MinHeight" Value="{DynamicResource TextBoxWrapperSmallHeight}" />
         </Style>
 
         <Style Selector="^.Bordered">
@@ -266,15 +255,13 @@
         <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
         <Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
         <Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
-        <Setter Property="TextBox.BackgroundSizing" Value="OuterBorderEdge" />
         <Setter Property="TextBox.BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
         <Setter Property="TextBox.CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
         <Setter Property="TextBox.FontSize" Value="14" />
         <Setter Property="TextBox.Cursor" Value="Ibeam" />
         <Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
         <Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
-        <Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
+        <Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxWrapperDefaultHeight}" />
-        <Setter Property="TextBox.VerticalAlignment" Value="Center" />
         <Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
         <Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
         <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
@@ -286,11 +273,10 @@
                         Name="PART_ContentPresenterBorder"
                         MinHeight="{TemplateBinding MinHeight}"
                         Background="{TemplateBinding Background}"
-                        BackgroundSizing="{TemplateBinding BackgroundSizing}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *, Auto">
+                        <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *">
                             <ContentPresenter
                                 Grid.Column="0"
                                 Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
@@ -319,7 +305,6 @@
                                         Name="PART_TextPresenter"
                                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                        CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
                                         CaretBrush="{TemplateBinding CaretBrush}"
                                         CaretIndex="{TemplateBinding CaretIndex}"
                                         LineHeight="{TemplateBinding LineHeight}"
@@ -335,13 +320,6 @@
                                         TextWrapping="{TemplateBinding TextWrapping}" />
                                 </Panel>
                             </ScrollViewer>
-                            <ContentPresenter
-                                Grid.Column="2"
-                                Padding="{DynamicResource TextBoxInnerRightContentPadding}"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding InnerRightContent}"
-                                Foreground="{DynamicResource TextBoxInnerForeground}"
-                                IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerRightContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
                         </Grid>
                     </Border>
                 </DataValidationErrors>
@@ -384,80 +362,4 @@
             </Style>
         </Style>
     </ControlTheme>
-
-    <ControlTheme x:Key="LooklessTextBox" TargetType="TextBox">
-        <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" />
-        <Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
-        <Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
-        <Setter Property="TextBox.FontSize" Value="14" />
-        <Setter Property="TextBox.Cursor" Value="Ibeam" />
-        <Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
-        <Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
-        <Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
-        <Setter Property="TextBox.VerticalAlignment" Value="Center" />
-        <Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
-        <Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
-        <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-        <Setter Property="TextBox.Template">
-            <ControlTemplate TargetType="TextBox">
-                <Border Name="PART_ContentPresenterBorder" MinHeight="{TemplateBinding MinHeight}">
-                    <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *, Auto">
-                        <ContentPresenter
-                            Grid.Column="0"
-                            Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding InnerLeftContent}"
-                            Foreground="{DynamicResource TextBoxInnerForeground}"
-                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerLeftContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
-                        <ScrollViewer
-                            Grid.Column="1"
-                            AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
-                            HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                            IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                            VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
-                            <Panel>
-                                <TextBlock
-                                    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}" />
-                                <TextPresenter
-                                    Name="PART_TextPresenter"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    CaretBrush="{TemplateBinding CaretBrush}"
-                                    CaretIndex="{TemplateBinding CaretIndex}"
-                                    LineHeight="{TemplateBinding LineHeight}"
-                                    PasswordChar="{TemplateBinding PasswordChar}"
-                                    RevealPassword="{TemplateBinding RevealPassword}"
-                                    SelectionBrush="{TemplateBinding SelectionBrush}"
-                                    SelectionEnd="{TemplateBinding SelectionEnd}"
-                                    SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
-                                    SelectionStart="{TemplateBinding SelectionStart}"
-                                    Text="{TemplateBinding Text, Mode=TwoWay}"
-                                    TextAlignment="{TemplateBinding TextAlignment}"
-                                    TextWrapping="{TemplateBinding TextWrapping}" />
-                            </Panel>
-                        </ScrollViewer>
-                        <ContentPresenter
-                            Grid.Column="2"
-                            Padding="{DynamicResource TextBoxInnerRightContentPadding}"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding InnerRightContent}"
-                            Foreground="{DynamicResource TextBoxInnerForeground}"
-                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerRightContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
-                    </Grid>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-
-        <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
-        </Style>
-    </ControlTheme>
-
 </ResourceDictionary>

src/Semi.Avalonia/Controls/TimePicker.axaml

@@ -136,7 +136,6 @@
         <Setter Property="CornerRadius" Value="3" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
         <Setter Property="Template">
             <ControlTemplate>
                 <DataValidationErrors>
@@ -150,7 +149,7 @@
                             Grid.ColumnSpan="2"
                             Width="242"
                             MinWidth="242"
-                            MinHeight="{TemplateBinding MinHeight}"
+                            MinHeight="{DynamicResource DateTimePickerButtonDefaultHeight}"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             Background="{TemplateBinding Background}"
@@ -172,19 +171,19 @@
                                         VerticalAlignment="Stretch">
                                         <TextBlock
                                             x:Name="PART_HourTextBlock"
-                                            Padding="12,0"
+                                            Padding="12,4"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             FontFamily="{TemplateBinding FontFamily}"
                                             FontSize="{TemplateBinding FontSize}"
-                                            FontWeight="{TemplateBinding FontWeight}"
+                                            FontWeight="{TemplateBinding FontWeight}" />
-                                            Text="{DynamicResource STRING_TIMEPICKER_HOUR_TEXT}" />
                                     </Border>
 
                                     <Rectangle
                                         Name="PART_FirstColumnDivider"
                                         Grid.Column="1"
                                         Width="1"
+                                        Margin="0,4"
                                         HorizontalAlignment="Center"
                                         Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
 
@@ -195,19 +194,19 @@
                                         VerticalAlignment="Stretch">
                                         <TextBlock
                                             x:Name="PART_MinuteTextBlock"
-                                            Padding="12,0"
+                                            Padding="12,4"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             FontFamily="{TemplateBinding FontFamily}"
                                             FontSize="{TemplateBinding FontSize}"
-                                            FontWeight="{TemplateBinding FontWeight}"
+                                            FontWeight="{TemplateBinding FontWeight}" />
-                                            Text="{DynamicResource STRING_TIMEPICKER_MINUTE_TEXT}" />
                                     </Border>
 
                                     <Rectangle
                                         Name="PART_SecondColumnDivider"
                                         Grid.Column="3"
                                         Width="1"
+                                        Margin="0,4"
                                         HorizontalAlignment="Center"
                                         Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
 
@@ -218,7 +217,7 @@
                                         VerticalAlignment="Stretch">
                                         <TextBlock
                                             x:Name="PART_PeriodTextBlock"
-                                            Padding="12,0"
+                                            Padding="12,4"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             FontFamily="{TemplateBinding FontFamily}"
@@ -279,10 +278,10 @@
             <Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
         </Style>
 
-        <Style Selector="^.Large">
+        <Style Selector="^.Large /template/ Button#PART_FlyoutButton">
             <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonLargeHeight}" />
         </Style>
-        <Style Selector="^.Small">
+        <Style Selector="^.Small /template/ Button#PART_FlyoutButton">
             <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonSmallHeight}" />
         </Style>
     </ControlTheme>

src/Semi.Avalonia/Controls/ToggleButton.axaml

@@ -20,30 +20,24 @@
         </StackPanel>
     </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type ToggleButton}" TargetType="ToggleButton">
-        <Setter Property="Background" Value="{DynamicResource ToggleButtonDefaultBackground}" />
+        <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDefaultBackground}" />
-        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
+        <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultPrimaryForeground}" />
-        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultPrimaryForeground}" />
+        <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDefaultBorderBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonDefaultBorderBrush}" />
+        <Setter Property="ToggleButton.CornerRadius" Value="{DynamicResource ToggleButtonCornerRadius}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ToggleButtonCornerRadius}" />
+        <Setter Property="ToggleButton.BorderThickness" Value="{DynamicResource ToggleButtonBorderThickness}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ToggleButtonBorderThickness}" />
+        <Setter Property="ToggleButton.Padding" Value="{DynamicResource ToggleButtonDefaultPadding}" />
-        <Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
+        <Setter Property="ToggleButton.RenderTransform" Value="none" />
-        <Setter Property="RenderTransform" Value="none" />
+        <Setter Property="ToggleButton.FontSize" Value="{DynamicResource ToggleButtonDefaultFontSize}" />
-        <Setter Property="FontSize" Value="{DynamicResource ToggleButtonDefaultFontSize}" />
+        <Setter Property="ToggleButton.FontWeight" Value="{DynamicResource ToggleButtonDefaultFontWeight}" />
-        <Setter Property="FontWeight" Value="{DynamicResource ToggleButtonDefaultFontWeight}" />
+        <Setter Property="ToggleButton.HorizontalContentAlignment" Value="Center" />
-        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="ToggleButton.VerticalContentAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="ToggleButton.MinHeight" Value="12" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="ToggleButton.Cursor" Value="Hand" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="ToggleButton.Template">
-        <Setter Property="MinHeight" Value="{DynamicResource ButtonDefaultHeight}" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Template">
             <ControlTemplate TargetType="ToggleButton">
                 <ContentPresenter
                     x:Name="PART_ContentPresenter"
-                    BackgroundSizing="{TemplateBinding BackgroundSizing}"
                     Padding="{TemplateBinding Padding}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                     Background="{TemplateBinding Background}"
@@ -260,11 +254,9 @@
 
         <Style Selector="^.Large">
             <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
-            <Setter Property="MinHeight" Value="{DynamicResource ButtonLargeHeight}" />
         </Style>
         <Style Selector="^.Small">
             <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
-            <Setter Property="MinHeight" Value="{DynamicResource ButtonSmallHeight}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/ToggleSwitch.axaml

@@ -15,13 +15,6 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FocusAdorner">
-            <FocusAdornerTemplate>
-                <Border BorderThickness="{DynamicResource AdornerLayerBorderThickness}"
-                        BorderBrush="{DynamicResource AdornerLayerStroke}" 
-                        CornerRadius="100"/>
-            </FocusAdornerTemplate>
-        </Setter>
         <Setter Property="KnobTransitions">
             <Transitions>
                 <DoubleTransition
@@ -35,99 +28,76 @@
                 <Grid
                     Background="{TemplateBinding Background}"
                     Cursor="Hand"
-                    RowDefinitions="Auto,*"
+                    RowDefinitions="Auto,*">
-                    ColumnDefinitions="Auto, *">
                     <ContentPresenter
                         x:Name="PART_ContentPresenter"
-                        Grid.Row="0" Grid.Column="0"
+                        Grid.Row="0"
-                        Grid.ColumnSpan="2"
                         Margin="{DynamicResource ToggleSwitchHeaderMargin}"
                         VerticalAlignment="Top"
                         Content="{TemplateBinding Content}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
                         IsVisible="{TemplateBinding Content, Converter={x:Static ObjectConverters.IsNotNull}}"
                         RecognizesAccessKey="True" />
-
+                    <Grid
-                    <Border
+                        Grid.Row="1"
-                        x:Name="SwitchBackgroundBorder"
+                        Background="Transparent"
-                        Grid.Row="1" Grid.Column="0"
+                        ColumnDefinitions="Auto, *">
-                        TemplatedControl.IsTemplateFocusTarget="True"
+                        <Grid
-                        Width="{DynamicResource ToggleSwitchDefaultWidth}"
+                            Grid.Column="0"
-                        Height="{DynamicResource ToggleSwitchDefaultHeight}"
+                            Grid.ColumnSpan="2"
-                        CornerRadius="100">
+                            TemplatedControl.IsTemplateFocusTarget="True" />
-                        <Border.Transitions>
+                        <Border
-                            <Transitions>
+                            x:Name="SwitchBackgroundBorder"
-                                <BrushTransition Property="Background" Duration="0:0:0.2" />
+                            Grid.Column="0"
-                            </Transitions>
+                            Width="{DynamicResource ToggleSwitchDefaultWidth}"
-                        </Border.Transitions>
+                            Height="{DynamicResource ToggleSwitchDefaultHeight}"
-                        <Canvas
+                            CornerRadius="100">
-                            x:Name="PART_SwitchKnob"
+                            <Border.Transitions>
-                            Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
+                                <Transitions>
-                            Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
+                                    <BrushTransition Property="Background" Duration="0:0:0.2" />
-                            HorizontalAlignment="Left">
+                                </Transitions>
-                            <Grid
+                            </Border.Transitions>
-                                x:Name="PART_MovingKnobs"
+                            <Canvas
+                                x:Name="PART_SwitchKnob"
                                 Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
                                 Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
-                                Margin="{DynamicResource ToggleSwitchIndicatorDefaultMargin}">
+                                HorizontalAlignment="Left">
-                                <Border
+                                <Grid
-                                    x:Name="SwitchKnobIndicator"
+                                    x:Name="PART_MovingKnobs"
-                                    Background="White"
+                                    Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
-                                    BoxShadow="0 0 1 1 #222E3238"
+                                    Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
-                                    CornerRadius="100" />
+                                    Margin="{DynamicResource ToggleSwitchIndicatorDefaultMargin}">
-                                <Arc
+                                    <Border
-                                    x:Name="SwitchKnobLoadingIndicator"
+                                        x:Name="SwitchKnobIndicator"
-                                    IsVisible="False"
+                                        Background="White"
-                                    StrokeThickness="2"
+                                        BoxShadow="0 0 1 1 #222E3238"
-                                    StartAngle="0"
+                                        CornerRadius="100" />
-                                    SweepAngle="140"
+                                </Grid>
-                                    StrokeJoin="Round"
+                            </Canvas>
-                                    StrokeLineCap="Round">
+                        </Border>
-                                    <Arc.Stroke>
-                                        <ConicGradientBrush>
-                                            <GradientStops>
-                                                <GradientStop Offset="0.1" Color="Transparent" />
-                                                <GradientStop Offset="0.7" Color="White" />
-                                            </GradientStops>
-                                        </ConicGradientBrush>
-                                    </Arc.Stroke>
-                                    <Arc.Styles>
-                                        <Style Selector="Arc[IsVisible=True]">
-                                            <Style.Animations>
-                                                <Animation IterationCount="Infinite" Duration="0:0:0.6">
-                                                    <KeyFrame Cue="0%">
-                                                        <Setter Property="RotateTransform.Angle" Value="0.0" />
-                                                    </KeyFrame>
-                                                    <KeyFrame Cue="100%">
-                                                        <Setter Property="RotateTransform.Angle" Value="360.0" />
-                                                    </KeyFrame>
-                                                </Animation>
-                                            </Style.Animations>
-                                        </Style>
-                                    </Arc.Styles>
-                                </Arc>
-                            </Grid>
-                        </Canvas>
-                    </Border>
 
-                    <ContentPresenter
+                        <ContentPresenter
-                        x:Name="PART_OnContentPresenter"
+                            x:Name="PART_OnContentPresenter"
-                        Grid.Row="1" Grid.Column="1"
+                            Grid.Column="1"
-                        Margin="{DynamicResource ToggleSwitchOnContentMargin}"
+                            Margin="{DynamicResource ToggleSwitchOnContentMargin}"
-                        HorizontalAlignment="Left"
+                            HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
+                            VerticalAlignment="Center"
-                        VerticalContentAlignment="Center"
+                            VerticalContentAlignment="Center"
-                        Content="{TemplateBinding OnContent}"
+                            Content="{TemplateBinding OnContent}"
-                        ContentTemplate="{TemplateBinding OnContentTemplate}" />
+                            ContentTemplate="{TemplateBinding OnContentTemplate}"
-                    <ContentPresenter
+                            IsVisible="True" />
-                        x:Name="PART_OffContentPresenter"
+                        <ContentPresenter
-                        Grid.Row="1" Grid.Column="1"
+                            x:Name="PART_OffContentPresenter"
-                        Margin="{DynamicResource ToggleSwitchOnContentMargin}"
+                            Grid.Column="1"
-                        HorizontalAlignment="Left"
+                            Margin="{DynamicResource ToggleSwitchOnContentMargin}"
-                        VerticalAlignment="Center"
+                            HorizontalAlignment="Left"
-                        VerticalContentAlignment="Center"
+                            VerticalAlignment="Center"
-                        Content="{TemplateBinding OffContent}"
+                            VerticalContentAlignment="Center"
-                        ContentTemplate="{TemplateBinding OffContentTemplate}" />
+                            Content="{TemplateBinding OffContent}"
+                            ContentTemplate="{TemplateBinding OffContentTemplate}"
+                            IsVisible="False" />
+
+                    </Grid>
                 </Grid>
             </ControlTemplate>
         </Setter>
@@ -179,22 +149,6 @@
                 <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerCheckedDisabledBackground}" />
             </Style>
         </Style>
-
-        <Style Selector="^.Loading">
-            <Style Selector="^ /template/ Border#SwitchKnobIndicator">
-                <Setter Property="IsVisible" Value="False" />
-            </Style>
-            <Style Selector="^ /template/ Arc#SwitchKnobLoadingIndicator">
-                <Setter Property="IsVisible" Value="True" />
-            </Style>
-            <Style Selector="^:unchecked /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedPointeroverBackground}" />
-            </Style>
-            <Style Selector="^:checked /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerCheckedPointeroverBackground}" />
-            </Style>
-        </Style>
-
         <Style Selector="^.Small">
             <Style Selector="^ /template/ Border#SwitchBackgroundBorder">
                 <Setter Property="Width" Value="{DynamicResource ToggleSwitchSmallWidth}" />
@@ -209,9 +163,6 @@
                 <Setter Property="Height" Value="{DynamicResource ToggleSwitchIndicatorSmallWidth}" />
                 <Setter Property="Margin" Value="{DynamicResource ToggleSwitchIndicatorSmallMargin}"/>
             </Style>
-            <Style Selector="^ /template/ Arc#SwitchKnobLoadingIndicator">
-                <Setter Property="StrokeThickness" Value="{DynamicResource ToggleSwitchLoadingIndicatorSmallStrokeThickness}" />
-            </Style>
         </Style>
         <Style Selector="^.Large">
             <Style Selector="^ /template/ Border#SwitchBackgroundBorder">
@@ -227,9 +178,6 @@
                 <Setter Property="Height" Value="{DynamicResource ToggleSwitchIndicatorLargeWidth}" />
                 <Setter Property="Margin" Value="{DynamicResource ToggleSwitchIndicatorLargeMargin}"/>
             </Style>
-            <Style Selector="^ /template/ Arc#SwitchKnobLoadingIndicator">
-                <Setter Property="StrokeThickness" Value="{DynamicResource ToggleSwitchLoadingIndicatorLargeStrokeThickness}" />
-            </Style>
         </Style>
     </ControlTheme>
 
@@ -240,12 +188,6 @@
         <Setter Property="Padding" Value="8" />
         <Setter Property="CornerRadius" Value="3" />
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="FocusAdorner">
-            <FocusAdornerTemplate>
-                <Border BorderThickness="{DynamicResource AdornerLayerBorderThickness}"
-                        BorderBrush="{DynamicResource AdornerLayerStroke}" />
-            </FocusAdornerTemplate>
-        </Setter>
         <Setter Property="Template">
             <ControlTemplate TargetType="ToggleSwitch">
                 <Border
@@ -254,9 +196,9 @@
                     Background="{TemplateBinding Background}"
                     CornerRadius="{TemplateBinding CornerRadius}"
                     Cursor="Hand">
-                    <Panel>
+                    <Grid ColumnDefinitions="Auto">
-                        <Panel x:Name="PART_SwitchKnob" />
+                        <Grid x:Name="PART_SwitchKnob" />
-                        <Panel x:Name="PART_MovingKnobs" />
+                        <Grid x:Name="PART_MovingKnobs" />
                         <ContentPresenter
                             x:Name="PART_OnContentPresenter"
                             Margin="{DynamicResource ToggleSwitchOnContentMargin}"
@@ -267,7 +209,7 @@
                             Margin="{DynamicResource ToggleSwitchOnContentMargin}"
                             Content="{TemplateBinding OffContent}"
                             ContentTemplate="{TemplateBinding OffContentTemplate}" />
-                    </Panel>
+                    </Grid>
                 </Border>
             </ControlTemplate>
         </Setter>
@@ -283,29 +225,29 @@
         x:Key="SimpleToggleSwitch"
         BasedOn="{StaticResource {x:Type ToggleSwitch}}"
         TargetType="ToggleSwitch">
-        <Setter Property="OnContent" Value="{x:Null}" />
-        <Setter Property="OffContent" Value="{x:Null}" />
-        <Setter Property="FontSize" Value="{DynamicResource SimpleToggleSwitchFontSize}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="ToggleSwitch">
-                <Border
+                <Grid
-                    x:Name="SwitchBackgroundBorder"
                     Background="{TemplateBinding Background}"
                     Cursor="Hand"
-                    Width="{DynamicResource ToggleSwitchDefaultWidth}"
+                    ColumnDefinitions="Auto, *">
-                    Height="{DynamicResource ToggleSwitchDefaultHeight}"
-                    CornerRadius="100">
-                    <Border.Transitions>
-                        <Transitions>
-                            <BrushTransition Property="Background" Duration="0:0:0.2" />
-                        </Transitions>
-                    </Border.Transitions>
                     <Grid
-                        ColumnDefinitions="*,*">
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        TemplatedControl.IsTemplateFocusTarget="True" />
+                    <Border
+                        x:Name="SwitchBackgroundBorder"
+                        Grid.Column="0"
+                        Width="{DynamicResource ToggleSwitchDefaultWidth}"
+                        Height="{DynamicResource ToggleSwitchDefaultHeight}"
+                        CornerRadius="100">
+                        <Border.Transitions>
+                            <Transitions>
+                                <BrushTransition Property="Background" Duration="0:0:0.2" />
+                            </Transitions>
+                        </Border.Transitions>
                         <Canvas
                             x:Name="PART_SwitchKnob"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
                             Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
                             Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
                             HorizontalAlignment="Left">
@@ -319,74 +261,11 @@
                                     Background="White"
                                     BoxShadow="0 0 1 1 #222E3238"
                                     CornerRadius="100" />
-                                <Arc
-                                    x:Name="SwitchKnobLoadingIndicator"
-                                    IsVisible="False"
-                                    StrokeThickness="2"
-                                    StartAngle="0"
-                                    SweepAngle="140"
-                                    StrokeJoin="Round"
-                                    StrokeLineCap="Round">
-                                    <Arc.Stroke>
-                                        <ConicGradientBrush>
-                                            <GradientStops>
-                                                <GradientStop Offset="0.1" Color="Transparent" />
-                                                <GradientStop Offset="0.7" Color="White" />
-                                            </GradientStops>
-                                        </ConicGradientBrush>
-                                    </Arc.Stroke>
-                                    <Arc.Styles>
-                                        <Style Selector="Arc[IsVisible=True]">
-                                            <Style.Animations>
-                                                <Animation IterationCount="Infinite" Duration="0:0:0.6">
-                                                    <KeyFrame Cue="0%">
-                                                        <Setter Property="RotateTransform.Angle" Value="0.0" />
-                                                    </KeyFrame>
-                                                    <KeyFrame Cue="100%">
-                                                        <Setter Property="RotateTransform.Angle" Value="360.0" />
-                                                    </KeyFrame>
-                                                </Animation>
-                                            </Style.Animations>
-                                        </Style>
-                                    </Arc.Styles>
-                                </Arc>
                             </Grid>
                         </Canvas>
-                        <ContentPresenter
+                    </Border>
-                            x:Name="PART_OnContentPresenter"
+                </Grid>
-                            Grid.Column="0"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"
-                            FontSize="{TemplateBinding FontSize}"
-                            Foreground="{TemplateBinding Foreground}"
-                            Content="{TemplateBinding OnContent}"
-                            ContentTemplate="{TemplateBinding OnContentTemplate}" />
-                        <ContentPresenter
-                            x:Name="PART_OffContentPresenter"
-                            Grid.Column="1"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"
-                            FontSize="{TemplateBinding FontSize}"
-                            Foreground="{TemplateBinding Foreground}"
-                            Content="{TemplateBinding OffContent}"
-                            ContentTemplate="{TemplateBinding OffContentTemplate}" />
-                    </Grid>
-                </Border>
             </ControlTemplate>
         </Setter>
-        <Style Selector="^:unchecked">
-            <Setter Property="Foreground" Value="{DynamicResource SimpleToggleSwitchContainerUnCheckedForeground}" />
-        </Style>
-        <Style Selector="^:checked">
-            <Setter Property="Foreground" Value="{DynamicResource SimpleToggleSwitchContainerCheckedForeground}" />
-        </Style>
-        <Style Selector="^.Small">
-            <Style Selector="^ /template/ ContentPresenter#PART_OnContentPresenter">
-                <Setter Property="IsVisible" Value="False" />
-            </Style>
-            <Style Selector="^ /template/ ContentPresenter#PART_OffContentPresenter">
-                <Setter Property="IsVisible" Value="False" />
-            </Style>
-        </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/UserControl.axaml

@@ -0,0 +1,23 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:CompileBindings="True">
+    <!--  Add Resources Here  -->
+    <ControlTheme x:Key="{x:Type UserControl}" TargetType="UserControl">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="UserControl">
+                <ContentPresenter
+                    Name="PART_ContentPresenter"
+                    Padding="{TemplateBinding Padding}"
+                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Content="{TemplateBinding Content}"
+                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                    CornerRadius="{TemplateBinding CornerRadius}" />
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>