feat: enhance MenuItem icon.

.github/FUNDING.yml

@@ -1,15 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: semiavalonia
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-polar: # Replace with a single Polar username
-buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
-thanks_dev: # Replace with a single thanks.dev username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/pack-nightly.yml

@@ -21,7 +21,7 @@ on:
       Semi_Avalonia_DataGrid:
         description: 'Pack Semi.Avalonia.DataGrid'
         required: true
-        default: 'false'
+        default: 'true'
         type: boolean
       Semi_Avalonia_TreeDataGrid:
         description: 'Pack Semi.Avalonia.TreeDataGrid'

.github/workflows/pack.yml

@@ -16,7 +16,7 @@ on:
       Semi_Avalonia_DataGrid:
         description: 'Pack Semi.Avalonia.DataGrid'
         required: true
-        default: 'false'
+        default: 'true'
         type: boolean
       Semi_Avalonia_TreeDataGrid:
         description: 'Pack Semi.Avalonia.TreeDataGrid'

.github/workflows/release-tag.yml

@@ -20,6 +20,9 @@ jobs:
       - name: Pack Semi.Avalonia.ColorPicker
         run: dotnet pack ./src/Semi.Avalonia.ColorPicker -o ./nugets
 
+      - name: Pack Semi.Avalonia.DataGrid
+        run: dotnet pack ./src/Semi.Avalonia.DataGrid -o ./nugets
+
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v4
         with:

README.md

@@ -48,9 +48,9 @@ dotnet add package Semi.Avalonia.TreeDataGrid
 
 ```xaml
 <Application.Styles>
-    <semi:ColorPickerSemiTheme />
+    <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
-    <semi:DataGridSemiTheme />
+    <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
-    <semi:TreeDataGridSemiTheme />
+    <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
 </Application.Styles>
 ```
 

README_CN.md

@@ -48,9 +48,9 @@ dotnet add package Semi.Avalonia.TreeDataGrid
 
 ```xaml
 <Application.Styles>
-    <semi:ColorPickerSemiTheme />
+    <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
-    <semi:DataGridSemiTheme />
+    <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
-    <semi:TreeDataGridSemiTheme />
+    <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
 </Application.Styles>
 ```
 

Semi.Avalonia.sln

@@ -39,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Semi.Avalonia.Demo.Drm", "d
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Semi.Avalonia.TreeDataGrid", "src\Semi.Avalonia.TreeDataGrid\Semi.Avalonia.TreeDataGrid.csproj", "{398D2998-0835-41F5-99A3-608CAB8051E2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Semi.Avalonia.TreeDataGrid.Demo", "demo\Semi.Avalonia.TreeDataGrid.Demo\Semi.Avalonia.TreeDataGrid.Demo.csproj", "{6178B545-4BB6-458C-A27C-EE11F3885D38}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -82,6 +84,10 @@ Global
 		{398D2998-0835-41F5-99A3-608CAB8051E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{398D2998-0835-41F5-99A3-608CAB8051E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{398D2998-0835-41F5-99A3-608CAB8051E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6178B545-4BB6-458C-A27C-EE11F3885D38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6178B545-4BB6-458C-A27C-EE11F3885D38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6178B545-4BB6-458C-A27C-EE11F3885D38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6178B545-4BB6-458C-A27C-EE11F3885D38}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -92,6 +98,7 @@ Global
 		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0} = {43091528-9509-43CB-A003-9C5C11E96DD6}
 		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F} = {43091528-9509-43CB-A003-9C5C11E96DD6}
 		{86D93406-412A-4429-93B2-92AAD0407784} = {43091528-9509-43CB-A003-9C5C11E96DD6}
+		{6178B545-4BB6-458C-A27C-EE11F3885D38} = {43091528-9509-43CB-A003-9C5C11E96DD6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7CA41ED3-2CED-40CC-AA21-28C3B42B1E86}

demo/Directory.Build.props

@@ -1,7 +1,6 @@
 <Project>
     <PropertyGroup>
-        <AvaloniaVersion>11.2.5</AvaloniaVersion>
+        <AvaloniaVersion>11.2.3</AvaloniaVersion>
-        <DataGridVersion>11.2.5</DataGridVersion>
         <CommunityToolkitVersion>8.4.0</CommunityToolkitVersion>
     </PropertyGroup>
 </Project>

demo/Semi.Avalonia.Demo/App.axaml

@@ -7,16 +7,18 @@
     xmlns:semi="https://irihi.tech/semi"
     xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels">
     <Application.Styles>
+        <!-- You can still reference in old way.  -->
+        <!-- <StyleInclude Source="avares://Semi.Avalonia/Index.axaml" /> -->
         <semi:SemiTheme Locale="zh-CN" />
         <semi:SemiPopupAnimations />
-        <semi:ColorPickerSemiTheme />
+        <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
-        <semi:DataGridSemiTheme />
+        <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
-        <semi:TreeDataGridSemiTheme />
     </Application.Styles>
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="Themes/_index.axaml" />
+                <ResourceInclude
+                    Source="Themes/_index.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

demo/Semi.Avalonia.Demo/Constant/ColorTokens.cs

@@ -1,143 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Semi.Avalonia.Demo.Constant;
-
-public static class ColorTokens
-{
-    public static IReadOnlyList<Tuple<string, string>> PrimaryTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorPrimary", "Primary"),
-        new("SemiColorPrimaryPointerover", "Primary Pointerover"),
-        new("SemiColorPrimaryActive", "Primary Active"),
-        new("SemiColorPrimaryDisabled", "Primary Disabled"),
-        new("SemiColorPrimaryLight", "Primary Light"),
-        new("SemiColorPrimaryLightPointerover", "Primary Light Pointerover"),
-        new("SemiColorPrimaryLightActive", "Primary Light Active"),
-    };
-
-    public static IReadOnlyList<Tuple<string, string>> SecondaryTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorSecondary", "Secondary"),
-        new("SemiColorSecondaryPointerover", "Secondary Pointerover"),
-        new("SemiColorSecondaryActive", "Secondary Active"),
-        new("SemiColorSecondaryDisabled", "Secondary Disabled"),
-        new("SemiColorSecondaryLight", "Secondary Light"),
-        new("SemiColorSecondaryLightPointerover", "Secondary Light Pointerover"),
-        new("SemiColorSecondaryLightActive", "Secondary Light Active"),
-    };
-
-    public static IReadOnlyList<Tuple<string, string>> TertiaryTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorTertiary", "Tertiary"),
-        new("SemiColorTertiaryPointerover", "Tertiary Pointerover"),
-        new("SemiColorTertiaryActive", "Tertiary Active"),
-        new("SemiColorTertiaryLight", "Tertiary Light"),
-        new("SemiColorTertiaryLightPointerover", "Tertiary Light Pointerover"),
-        new("SemiColorTertiaryLightActive", "Tertiary Light Active"),
-    };
-
-    public static IReadOnlyList<Tuple<string, string>> InformationTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorInformation", "Information"),
-        new("SemiColorInformationPointerover", "Information Pointerover"),
-        new("SemiColorInformationActive", "Information Active"),
-        new("SemiColorInformationDisabled", "Information Disabled"),
-        new("SemiColorInformationLight", "Information Light"),
-        new("SemiColorInformationLightPointerover", "Information Light Pointerover"),
-        new("SemiColorInformationLightActive", "Information Light Active"),
-    };
-
-    public static IReadOnlyList<Tuple<string, string>> SuccessTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorSuccess", "Success"),
-        new("SemiColorSuccessPointerover", "Success Pointerover"),
-        new("SemiColorSuccessActive", "Success Active"),
-        new("SemiColorSuccessDisabled", "Success Disabled"),
-        new("SemiColorSuccessLight", "Success Light"),
-        new("SemiColorSuccessLightPointerover", "Success Light Pointerover"),
-        new("SemiColorSuccessLightActive", "Success Light Active"),
-    };
-
-    public static IReadOnlyList<Tuple<string, string>> WarningTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorWarning", "Warning"),
-        new("SemiColorWarningPointerover", "Warning Pointerover"),
-        new("SemiColorWarningActive", "Warning Active"),
-        new("SemiColorWarningLight", "Warning Light"),
-        new("SemiColorWarningLightPointerover", "Warning Light Pointerover"),
-        new("SemiColorWarningLightActive", "Warning Light Active"),
-    };
-
-    public static IReadOnlyList<Tuple<string, string>> DangerTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorDanger", "Danger"),
-        new("SemiColorDangerPointerover", "Danger Pointerover"),
-        new("SemiColorDangerActive", "Danger Active"),
-        new("SemiColorDangerLight", "Danger Light"),
-        new("SemiColorDangerLightPointerover", "Danger Light Pointerover"),
-        new("SemiColorDangerLightActive", "Danger Light Active"),
-    };
-
-    public static IReadOnlyList<Tuple<string, string>> TextTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorText0", "Text 0"),
-        new("SemiColorText1", "Text 1"),
-        new("SemiColorText2", "Text 2"),
-        new("SemiColorText3", "Text 3"),
-    };
-
-    public static IReadOnlyList<Tuple<string, string>> LinkTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorLink", "Link"),
-        new("SemiColorLinkPointerover", "Link Pointerover"),
-        new("SemiColorLinkActive", "Link Active"),
-        new("SemiColorLinkVisited", "Link Visited"),
-    };
-
-    public static IReadOnlyList<Tuple<string, string>> BackgroundTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorBackground0", "Background 0"),
-        new("SemiColorBackground1", "Background 1"),
-        new("SemiColorBackground2", "Background 2"),
-        new("SemiColorBackground3", "Background 3"),
-        new("SemiColorBackground4", "Background 4"),
-    };
-
-    public static IReadOnlyList<Tuple<string, string>> FillTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorFill0", "Fill 0"),
-        new("SemiColorFill1", "Fill 1"),
-        new("SemiColorFill2", "Fill 2"),
-    };
-
-    public static IReadOnlyList<Tuple<string, string>> BorderTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorBorder", "Border"),
-        new("SemiColorFocusBorder", "Focus Border"),
-    };
-
-    public static IReadOnlyList<Tuple<string, string>> DisabledTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorDisabledText", "Disabled Text"),
-        new("SemiColorDisabledBorder", "Disabled Border"),
-        new("SemiColorDisabledBackground", "Disabled Background"),
-        new("SemiColorDisabledFill", "Disabled Fill"),
-    };
-
-    public static IReadOnlyList<Tuple<string, string>> OtherTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorWhite", "White"),
-        new("SemiColorBlack", "Black"),
-        new("SemiColorNavBackground", "Navigation Background"),
-        new("SemiColorOverlayBackground", "Overlay Background"),
-        new("SemiColorHighlightBackground", "Highlight Background"),
-        new("SemiColorHighlight", "Highlight Text"),
-    };
-
-    public static IReadOnlyList<Tuple<string, string>> ShadowTokens { get; } = new List<Tuple<string, string>>
-    {
-        new("SemiColorShadow", "Shadow"),
-        new("SemiShadowElevated", "Shadow Elevated"),
-    };
-}

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

@@ -2,7 +2,8 @@
     x:Class="Semi.Avalonia.Demo.Pages.ColorPickerDemo"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:semi="https://irihi.tech/semi"
+    xmlns:colorPicker="clr-namespace:Semi.Avalonia.ColorPicker;assembly=Semi.Avalonia.ColorPicker"
+    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"
@@ -10,15 +11,18 @@
     mc:Ignorable="d">
     <ScrollViewer>
         <StackPanel Spacing="20">
-            <StackPanel Orientation="Horizontal" Spacing="20">
+            <StackPanel
+                VerticalAlignment="Top"
+                Orientation="Horizontal"
+                Spacing="20">
                 <ColorView Name="Test" ColorSpectrumShape="Ring" />
                 <ColorView ColorSpectrumShape="Box" />
                 <ColorView Palette="{DynamicResource SemiColorPalette}" />
             </StackPanel>
-            <StackPanel Orientation="Horizontal">
+            <StackPanel VerticalAlignment="Top" Orientation="Horizontal">
                 <ColorView
                     Name="SimpleColorViewTest"
-                    HsvColor="hsv(180,80%,70%)"
+                    HsvColor="hsv(120,11%,10%)"
                     IsAlphaVisible="True"
                     Theme="{StaticResource SimpleColorView}" />
                 <StackPanel>
@@ -26,55 +30,63 @@
                     <TextBlock Text="{Binding #SimpleColorViewTest.Color}" />
                 </StackPanel>
             </StackPanel>
-            <StackPanel Orientation="Horizontal" Spacing="8">
+            <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
-                <ColorPicker ColorSpectrumShape="Ring">
+                <ColorPicker Margin="8" ColorSpectrumShape="Ring">
                     <ColorPicker.Palette>
-                        <FlatHalfColorPalette />
+                        <controls:FlatHalfColorPalette />
                     </ColorPicker.Palette>
                 </ColorPicker>
-                <ColorPicker ColorSpectrumShape="Box">
+                <ColorPicker Margin="8" ColorSpectrumShape="Box">
                     <ColorPicker.Palette>
-                        <semi:SemiColorLightPalette />
+                        <colorPicker:SemiColorLightPalette />
                     </ColorPicker.Palette>
                 </ColorPicker>
+
                 <ColorPicker
-                    Theme="{DynamicResource HexColorPicker}"
+                    Margin="8"
-                    ColorSpectrumShape="Box">
+                    ColorSpectrumShape="Box"
+                    Theme="{DynamicResource HexColorPicker}">
                     <ColorPicker.Palette>
-                        <semi:SemiColorLightPalette />
+                        <colorPicker:SemiColorLightPalette />
                     </ColorPicker.Palette>
                 </ColorPicker>
             </StackPanel>
-            <StackPanel HorizontalAlignment="Left">
+            <StackPanel HorizontalAlignment="Left" >
-                <TextBlock Text="Use Style to customize button" />
+                <TextBlock Text="Use Style to customize button"></TextBlock>
                 <ColorPicker
                     Margin="8"
-                    MinWidth="32"
+                    Width="32"
-                    HsvColor="hsv(180,80%,70%)">
+                    HsvColor="hsv(120,11%,10%)"
+                    >
                     <ColorPicker.Content>
                         <Border
                             Margin="1"
-                            Background="{Binding $parent[ColorPicker].HsvColor, Converter={StaticResource ToBrushConverter}}"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Background="{Binding $parent[ColorPicker].HsvColor, 
+                                                     Converter={StaticResource ToBrushConverter}}"
                             CornerRadius="1" />
                     </ColorPicker.Content>
                     <ColorPicker.Styles>
                         <Style Selector="DropDownButton">
-                            <Setter Property="Padding" Value="0" />
+                            <Setter Property="Padding" Value="0"/>
                             <Style Selector="^ /template/ PathIcon">
-                                <Setter Property="IsVisible" Value="False" />
+                                <Setter Property="IsVisible" Value="False"/>
                             </Style>
                         </Style>
                     </ColorPicker.Styles>
                 </ColorPicker>
-            </StackPanel>
 
-            <StackPanel Orientation="Horizontal" Spacing="8">
+            </StackPanel>
+            <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
                 <ColorPicker
-                    Theme="{StaticResource SimpleColorPicker}"
+                    Margin="8"
-                    HsvColor="hsv(180,80%,70%)" />
+                    HsvColor="hsv(120,11%,10%)"
+                    Theme="{StaticResource SimpleColorPicker}" />
                 <ColorPicker
-                    Theme="{StaticResource HexSimpleColorPicker}"
+                    Margin="8"
-                    HsvColor="hsv(180,80%,70%)" />
+                    HsvColor="hsv(120,11%,10%)"
+                    Theme="{StaticResource HexSimpleColorPicker}" />
             </StackPanel>
         </StackPanel>
     </ScrollViewer>

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

@@ -3,6 +3,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Semi.Avalonia.Demo.Pages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels;assembly=Semi.Avalonia.Demo"
     d:DesignHeight="450"
@@ -14,9 +15,8 @@
         <TabItem Header="DataGrid">
            <Grid RowDefinitions="Auto, *">
                <StackPanel Grid.Row="0" Orientation="Horizontal">
-                   <ToggleSwitch Content="Enable" Name="enable" IsChecked="True" />
+                   <ToggleSwitch Content="Disable" Name="DisableToggle" />
-                   <ToggleSwitch Content="Inset Content" Name="inset" />
+                   <ToggleSwitch Content="ScrollViewerHide" Name="ScrollViewerHide" />
-                   <ToggleSwitch Content="ScrollBar Auto Hide" Name="autohide" />
                </StackPanel>
                <DataGrid Grid.Row="1"
                          Margin="8"
@@ -25,9 +25,8 @@
                          CanUserSortColumns="True"
                          HeadersVisibility="All"
                          IsReadOnly="True"
-                         Classes.InsetContent="{Binding #inset.IsChecked}"
+                         ScrollViewer.AllowAutoHide="{Binding #ScrollViewerHide.IsChecked}"
-                         ScrollViewer.AllowAutoHide="{Binding #autohide.IsChecked}"
+                         IsEnabled="{Binding #DisableToggle.IsChecked}"
-                         IsEnabled="{Binding #enable.IsChecked}"
                          ItemsSource="{Binding GridData1}">
                    <DataGrid.Columns>
                        <DataGridTextColumn

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

@@ -5,7 +5,6 @@
              xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels"
              xmlns:controls="clr-namespace:Semi.Avalonia.Demo.Controls"
              xmlns:cvt="clr-namespace:Semi.Avalonia.Demo.Converters"
-             xmlns:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
              mc:Ignorable="d" d:DesignWidth="1000" d:DesignHeight="1450"
              x:DataType="vm:HighContrastDemoViewModel"
              x:CompileBindings="True"
@@ -307,18 +306,6 @@
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
-
-                            <DataGridTemplateColumn Width="100" Header="CopyText">
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate DataType="vm:ColorResource">
-                                        <Button
-                                            Command="{Binding $parent[pages:HighContrastDemo].Copy}"
-                                            CommandParameter="{Binding CopyText}"
-                                            Theme="{DynamicResource  IconBorderlessButton}"
-                                            Content="{StaticResource SemiIconCopy}" />
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
                         </DataGrid.Columns>
                     </DataGrid>
                 </StackPanel>

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

@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
+using Avalonia.Controls;
-using Avalonia.Controls;
 using Semi.Avalonia.Demo.ViewModels;
 
 namespace Semi.Avalonia.Demo.Pages;
@@ -11,14 +10,4 @@ public partial class HighContrastDemo : UserControl
         InitializeComponent();
         this.DataContext = new HighContrastDemoViewModel();
     }
-
-    public async Task Copy(object? o)
-    {
-        if (o is null) return;
-        var toplevel = TopLevel.GetTopLevel(this);
-        if (toplevel?.Clipboard is { } c)
-        {
-            await c.SetTextAsync(o.ToString());
-        }
-    }
 }

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

@@ -119,11 +119,11 @@
                     <StackPanel Spacing="20">
                         <TextBlock Text="Theme: CheckGroupListBox"/>
                         <ListBox
-                            SelectionMode="Multiple,Toggle"
+                            SelectionMode="Multiple"
                             Theme="{DynamicResource CheckGroupListBox}"
                             ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
                         <ListBox Theme="{DynamicResource CheckGroupListBox}"
-                                 SelectionMode="Multiple,Toggle"
+                                 SelectionMode="Multiple"
                                  IsEnabled="False">
                             <ListBoxItem IsSelected="True">Avalonia</ListBoxItem>
                             <ListBoxItem>WPF</ListBoxItem>
@@ -131,11 +131,11 @@
 
                         <TextBlock Text="Theme: CardCheckGroupListBox"/>
                         <ListBox
-                            SelectionMode="Multiple,Toggle"
+                            SelectionMode="Multiple"
                             Theme="{DynamicResource CardCheckGroupListBox}"
                             ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
                         <ListBox Theme="{DynamicResource CardCheckGroupListBox}"
-                                 SelectionMode="Multiple,Toggle"
+                                 SelectionMode="Multiple"
                                  IsEnabled="False">
                             <ListBoxItem>Avalonia</ListBoxItem>
                             <ListBoxItem IsSelected="True">WPF</ListBoxItem>

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

@@ -50,6 +50,22 @@
                     <MenuItem Header="Radio 5" ToggleType="Radio" />
                 </MenuItem>
             </MenuItem>
+            <MenuItem Header="_Icon">
+                <MenuItem Header="Nothing" Icon="🐼" />
+                <MenuItem Header="TextBlock">
+                    <MenuItem.Icon>
+                        <TextBlock Text="🐼" />
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Geometry" Icon="{StaticResource SemiIconSemiLogo}" />
+                <MenuItem Header="PathIcon">
+                    <MenuItem.Icon>
+                        <PathIcon
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{DynamicResource SemiIconSemiLogo}" />
+                    </MenuItem.Icon>
+                </MenuItem>
+            </MenuItem>
             <MenuItem Header="Parent">
                 <MenuItem Header="Child 1" />
                 <MenuItem Header="Child 2" />

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

@@ -41,9 +41,9 @@
                     <Image.Source>
                         <DrawingImage>
                             <DrawingGroup>
-                                <GeometryDrawing Brush="#0D6EFD" Geometry="M74.8535 85.8231C75.0263 85.8231 75.1954 85.8231 75.3679 85.8231C80.7347 85.8231 85.1439 81.8027 85.7614 76.6019L85.8357 41.7604C85.2255 18.5931 66.2537 0 42.9393 0C19.2399 0 0.02771 19.2122 0.02771 42.9116C0.02771 66.3573 18.8309 85.418 42.18 85.8231H74.8535Z" />
+                                <GeometryDrawing Brush="#8B44AC" Geometry="M74.8535 85.8231C75.0263 85.8231 75.1954 85.8231 75.3679 85.8231C80.7347 85.8231 85.1439 81.8027 85.7614 76.6019L85.8357 41.7604C85.2255 18.5931 66.2537 0 42.9393 0C19.2399 0 0.02771 19.2122 0.02771 42.9116C0.02771 66.3573 18.8309 85.418 42.18 85.8231H74.8535Z" />
-                                <GeometryDrawing Brush="White" Geometry="M43.0585 14.6143C29.5513 14.6143 18.2555 24.082 15.4454 36.7432C18.1357 37.4975 20.1087 39.9679 20.1087 42.8992C20.1087 45.8305 18.1357 48.301 15.4454 49.0552C18.2555 61.7164 29.5513 71.1842 43.0585 71.1842C47.9754 71.1842 52.5993 69.9296 56.6276 67.723V70.9926H71.3435V44.0716C71.3569 43.7138 71.3435 43.2603 71.3435 42.8992C71.3435 27.2779 58.6799 14.6143 43.0585 14.6143ZM29.5096 42.8992C29.5096 35.4164 35.5757 29.3503 43.0585 29.3503C50.5414 29.3503 56.6074 35.4164 56.6074 42.8992C56.6074 50.3821 50.5414 56.4481 43.0585 56.4481C35.5757 56.4481 29.5096 50.3821 29.5096 42.8992Z" />
+                                <GeometryDrawing Brush="#F9F9FB" Geometry="M43.0585 14.6143C29.5513 14.6143 18.2555 24.082 15.4454 36.7432C18.1357 37.4975 20.1087 39.9679 20.1087 42.8992C20.1087 45.8305 18.1357 48.301 15.4454 49.0552C18.2555 61.7164 29.5513 71.1842 43.0585 71.1842C47.9754 71.1842 52.5993 69.9296 56.6276 67.723V70.9926H71.3435V44.0716C71.3569 43.7138 71.3435 43.2603 71.3435 42.8992C71.3435 27.2779 58.6799 14.6143 43.0585 14.6143ZM29.5096 42.8992C29.5096 35.4164 35.5757 29.3503 43.0585 29.3503C50.5414 29.3503 56.6074 35.4164 56.6074 42.8992C56.6074 50.3821 50.5414 56.4481 43.0585 56.4481C35.5757 56.4481 29.5096 50.3821 29.5096 42.8992Z" />
-                                <GeometryDrawing Brush="White" Geometry="M18.105 42.8805C18.105 45.3803 16.0785 47.4068 13.5787 47.4068C11.0789 47.4068 9.05237 45.3803 9.05237 42.8805C9.05237 40.3807 11.0789 38.3542 13.5787 38.3542C16.0785 38.3542 18.105 40.3807 18.105 42.8805Z" />
+                                <GeometryDrawing Brush="#F9F9FB" Geometry="M18.105 42.8805C18.105 45.3803 16.0785 47.4068 13.5787 47.4068C11.0789 47.4068 9.05237 45.3803 9.05237 42.8805C9.05237 40.3807 11.0789 38.3542 13.5787 38.3542C16.0785 38.3542 18.105 40.3807 18.105 42.8805Z" />
                             </DrawingGroup>
                         </DrawingImage>
                     </Image.Source>
@@ -234,7 +234,7 @@
                             VerticalAlignment="Top"
                             Palette="{DynamicResource SemiColorPalette}"
                             SelectedIndex="2"
-                            Color="#0D6EFD" />
+                            Color="#8B44AC" />
                         <StackPanel Width="300" Margin="8">
                             <StackPanel Orientation="Horizontal">
                                 <Slider

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

@@ -9,39 +9,41 @@ public partial class Overview : UserControl
         InitializeComponent();
     }
 
-    public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.2.1.7";
+    public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.2.1.3";
 
     public string MainStyle { get; set; } =
         """
         <Application.Styles>
+        <!-- You can still reference in old way.  -->
+        <!-- <StyleInclude Source="avares://Semi.Avalonia/Index.axaml" /> -->
             <semi:SemiTheme Locale="zh-CN" />
         </Application.Styles>
         """;
 
-    public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.2.1.7";
+    public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.2.1.3";
 
     public string ColorPickerStyle { get; set; } =
         """
         <Application.Styles>
-            <semi:ColorPickerSemiTheme />
+            <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
         </Application.Styles>
         """;
 
-    public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.2.1.7";
+    public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.2.1.3";
 
     public string DataGridStyle { get; set; } =
         """
         <Application.Styles>
-            <semi:DataGridSemiTheme />
+            <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
         </Application.Styles>
         """;
 
-    public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.10.3";
+    public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.10.1";
 
     public string TreeDataGridStyle { get; set; } =
         """
         <Application.Styles>
-            <semi:TreeDataGridSemiTheme />
+            <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
         </Application.Styles>
         """;
 }

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

@@ -1,6 +1,8 @@
 using System.Threading.Tasks;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Markup.Xaml;
 using Avalonia.Threading;
 using Semi.Avalonia.Demo.ViewModels;
 
@@ -14,20 +16,13 @@ public partial class PaletteDemo : UserControl
         this.DataContext = new PaletteDemoViewModel();
     }
 
-    protected override async void OnApplyTemplate(TemplateAppliedEventArgs e)
+    protected override async  void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
         PaletteDemoViewModel? vm = this.DataContext as PaletteDemoViewModel;
-        await Dispatcher.UIThread.InvokeAsync(() => { vm?.InitializeResources(); });
+        await Dispatcher.UIThread.InvokeAsync(() =>
-    }
-
-    public async Task Copy(object? o)
-    {
-        if (o is null) return;
-        var toplevel = TopLevel.GetTopLevel(this);
-        if (toplevel?.Clipboard is { } c)
         {
-            await c.SetTextAsync(o.ToString());
+            vm?.InitializeResources();
-        }
+        });
     }
 }

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

@@ -9,22 +9,66 @@
     mc:Ignorable="d">
     <ScrollViewer>
         <StackPanel HorizontalAlignment="Left" Spacing="20">
-            <ToggleSwitch Name="inset" Content="Inset Content" />
-            <ToggleSwitch Name="autohide" Content="Allow AutoHide" />
             <ScrollViewer
+                Width="200"
+                Height="200"
                 Margin="10"
-                Width="200" Height="200"
-                AllowAutoHide="{Binding #autohide.IsChecked}"
-                Classes.InsetContent="{Binding #inset.IsChecked}"
                 HorizontalScrollBarVisibility="Auto">
-                <UniformGrid
+                <Grid RowDefinitions="Auto,Auto"
-                    Rows="2" Columns="2"
+                      ColumnDefinitions="Auto,Auto"
-                    Width="300" Height="300">
+                      Width="300" Height="300">
-                    <Rectangle Fill="{DynamicResource SemiYellow2}" />
+                    <Rectangle
-                    <Rectangle Fill="{DynamicResource SemiBlue2}" />
+                        Grid.Row="0" Grid.Column="0"
-                    <Rectangle Fill="{DynamicResource SemiPink2}" />
+                        Width="150"
-                    <Rectangle Fill="{DynamicResource SemiGreen2}" />
+                        Height="150"
-                </UniformGrid>
+                        Fill="{DynamicResource SemiYellow2}" />
+                    <Rectangle
+                        Grid.Row="0" Grid.Column="1"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiBlue2}" />
+                    <Rectangle
+                        Grid.Row="1" Grid.Column="0"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiPink2}" />
+                    <Rectangle
+                        Grid.Row="1" Grid.Column="1"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiGreen2}" />
+                </Grid>
+            </ScrollViewer>
+            <ScrollViewer
+                Width="200"
+                Height="200"
+                Margin="10"
+                HorizontalScrollBarVisibility="Auto"
+                Theme="{DynamicResource StaticScrollViewer}">
+                <Grid RowDefinitions="Auto,Auto"
+                      ColumnDefinitions="Auto,Auto"
+                      Width="300" Height="300">
+                    <Rectangle
+                        Grid.Row="0" Grid.Column="0"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiYellow2}" />
+                    <Rectangle
+                        Grid.Row="0" Grid.Column="1"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiBlue2}" />
+                    <Rectangle
+                        Grid.Row="1" Grid.Column="0"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiPink2}" />
+                    <Rectangle
+                        Grid.Row="1" Grid.Column="1"
+                        Width="150"
+                        Height="150"
+                        Fill="{DynamicResource SemiGreen2}" />
+                </Grid>
             </ScrollViewer>
         </StackPanel>
     </ScrollViewer>

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

@@ -21,7 +21,8 @@
                         Content="IsPaneOpen" />
                     <ToggleSwitch
                         Grid.Row="0" Grid.Column="1"
-                        Name="PaneOpenButton" />
+                        Name="PaneOpenButton"
+                        IsChecked="{Binding #SplitView.IsPaneOpen}" />
 
                     <Label
                         Grid.Row="1" Grid.Column="0"
@@ -29,7 +30,8 @@
                         Content="UseLightDismissOverlayMode" />
                     <ToggleSwitch
                         Grid.Row="1" Grid.Column="1"
-                        Name="UseLightDismissOverlayModeButton" />
+                        Name="UseLightDismissOverlayModeButton"
+                        IsChecked="{Binding #SplitView.UseLightDismissOverlayMode}" />
 
                     <Label
                         Grid.Row="2" Grid.Column="0"
@@ -37,9 +39,9 @@
                         Content="Placement" />
                     <ToggleSwitch
                         Grid.Row="2" Grid.Column="1"
-                        Name="PanePlacementButton"
                         OffContent="Left"
-                        OnContent="Right" />
+                        OnContent="Right"
+                        IsChecked="{Binding #SplitView.PanePlacement}" />
 
                     <Label
                         Grid.Row="3" Grid.Column="0"
@@ -49,8 +51,8 @@
                         Grid.Row="3" Grid.Column="1"
                         Name="DisplayModeSelector"
                         HorizontalAlignment="Stretch"
-                        ItemsSource="{x:Static pages:SplitViewDemoViewModel.DisplayModes}"
+                        ItemsSource="{Binding DisplayModes}"
-                        SelectedItem="{x:Static SplitViewDisplayMode.CompactInline}" />
+                        SelectedIndex="{Binding #SplitView.DisplayMode}" />
 
                     <Label
                         Grid.Row="4" Grid.Column="0"
@@ -63,7 +65,7 @@
                         Minimum="0"
                         TickFrequency="1"
                         IsSnapToTickEnabled="True"
-                        Value="48" />
+                        Value="{Binding #SplitView.CompactPaneLength}" />
 
                     <Label
                         Grid.Row="5" Grid.Column="0"
@@ -76,209 +78,105 @@
                         Minimum="128"
                         TickFrequency="1"
                         IsSnapToTickEnabled="True"
-                        Value="256" />
+                        Value="{Binding #SplitView.OpenPaneLength}" />
                 </Grid>
             </Border>
-            <TabControl Grid.Column="0">
+            <Border
-                <TabItem Header="Default">
+                Grid.Column="0"
-                    <Border
+                BorderBrush="{DynamicResource SemiGrey1}"
-                        BorderBrush="{DynamicResource SemiGrey1}"
+                BorderThickness="1">
-                        BorderThickness="1">
+                <SplitView
-                        <SplitView
+                    Name="SplitView"
-                            Name="SplitView"
+                    DisplayMode="CompactOverlay"
-                            IsPaneOpen="{Binding #PaneOpenButton.IsChecked,Mode=TwoWay}"
+                    CompactPaneLength="48"
-                            UseLightDismissOverlayMode="{Binding #UseLightDismissOverlayModeButton.IsChecked}"
+                    OpenPaneLength="256">
-                            PanePlacement="{Binding #PanePlacementButton.IsChecked}"
+                    <SplitView.Background>
-                            DisplayMode="{Binding #DisplayModeSelector.SelectedItem}"
+                        <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
-                            CompactPaneLength="{Binding #CompactPaneLengthSlider.Value}"
+                            <GradientStop Color="#6b4c1b" Offset="0" />
-                            OpenPaneLength="{Binding #OpenPaneLengthSlider.Value}">
+                            <GradientStop Color="#291e10" Offset="1" />
-                            <SplitView.Background>
+                        </LinearGradientBrush>
-                                <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
+                    </SplitView.Background>
-                                    <GradientStop Color="#6b4c1b" Offset="0" />
+                    <SplitView.Pane>
-                                    <GradientStop Color="#291e10" Offset="1" />
+                        <Grid RowDefinitions="Auto,*,Auto">
+                            <TextBlock
+                                Grid.Row="0"
+                                Name="PaneHeader"
+                                Margin="8,12"
+                                FontWeight="Bold"
+                                Text="Playlist" />
+                            <ListBox
+                                Grid.Row="1"
+                                ItemsSource="{Binding Songs}" />
+                            <ToggleSwitch
+                                Grid.Row="2"
+                                Theme="{DynamicResource IconBorderlessToggleSwitch}"
+                                Content="{StaticResource SemiIconSidebar}"
+                                HorizontalAlignment="Left"
+                                IsChecked="{Binding #SplitView.IsPaneOpen}">
+                            </ToggleSwitch>
+                        </Grid>
+                    </SplitView.Pane>
+
+                    <Panel>
+                        <Panel.Styles>
+                            <Style Selector="Image#AlbumCover">
+                                <Style.Animations>
+                                    <Animation IterationCount="Infinite" Duration="0:0:40">
+                                        <KeyFrame Cue="0%">
+                                            <Setter Property="RotateTransform.Angle" Value="0" />
+                                        </KeyFrame>
+                                        <KeyFrame Cue="100%">
+                                            <Setter Property="RotateTransform.Angle" Value="360" />
+                                        </KeyFrame>
+                                    </Animation>
+                                </Style.Animations>
+                            </Style>
+                        </Panel.Styles>
+                        <Image
+                            Source="/Assets/WORLD.png"
+                            Name="AlbumCover"
+                            Width="200"
+                            Height="200" />
+                        <Arc
+                            Width="290"
+                            Height="290"
+                            StartAngle="0"
+                            SweepAngle="360"
+                            StrokeJoin="Round"
+                            StrokeLineCap="Round"
+                            StrokeThickness="45">
+                            <Arc.Stroke>
+                                <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,0%">
+                                    <GradientStop Color="#010101" Offset="0" />
+                                    <GradientStop Color="#363636" Offset="0.5" />
+                                    <GradientStop Color="#010101" Offset="1" />
                                 </LinearGradientBrush>
-                            </SplitView.Background>
+                            </Arc.Stroke>
-                            <SplitView.Pane>
+                        </Arc>
-                                <Grid RowDefinitions="Auto,*,Auto">
+                        <Arc
-                                    <TextBlock
+                            Width="294"
-                                        Grid.Row="0"
+                            Height="294"
-                                        Name="PaneHeader"
+                            StartAngle="0"
-                                        Margin="8,12"
+                            SweepAngle="360"
-                                        FontWeight="Bold"
+                            StrokeJoin="Round"
-                                        Text="Playlist" />
+                            StrokeLineCap="Round"
-                                    <ListBox
+                            StrokeThickness="4"
-                                        Grid.Row="1"
+                            Stroke="Black" />
-                                        ItemsSource="{Binding Songs}" />
+                        <Arc
-                                    <ToggleSwitch
+                            Width="310"
-                                        Grid.Row="2"
+                            Height="310"
-                                        Theme="{DynamicResource IconBorderlessToggleSwitch}"
+                            StartAngle="0"
-                                        Content="{StaticResource SemiIconSidebar}"
+                            SweepAngle="360"
-                                        HorizontalAlignment="Left"
+                            StrokeJoin="Round"
-                                        IsChecked="{Binding #SplitView.IsPaneOpen}">
+                            StrokeLineCap="Round"
-                                    </ToggleSwitch>
+                            StrokeThickness="10"
-                                </Grid>
+                            Stroke="#C6CACD"
-                            </SplitView.Pane>
+                            Opacity="0.1" />
+                    </Panel>
 
-                            <Panel>
+                </SplitView>
-                                <Panel.Styles>
+            </Border>
-                                    <Style Selector="Image#AlbumCover">
-                                        <Style.Animations>
-                                            <Animation IterationCount="Infinite" Duration="0:0:40">
-                                                <KeyFrame Cue="0%">
-                                                    <Setter Property="RotateTransform.Angle" Value="0" />
-                                                </KeyFrame>
-                                                <KeyFrame Cue="100%">
-                                                    <Setter Property="RotateTransform.Angle" Value="360" />
-                                                </KeyFrame>
-                                            </Animation>
-                                        </Style.Animations>
-                                    </Style>
-                                </Panel.Styles>
-                                <Image
-                                    Source="/Assets/WORLD.png"
-                                    Name="AlbumCover"
-                                    Width="200"
-                                    Height="200" />
-                                <Arc
-                                    Width="290"
-                                    Height="290"
-                                    StartAngle="0"
-                                    SweepAngle="360"
-                                    StrokeJoin="Round"
-                                    StrokeLineCap="Round"
-                                    StrokeThickness="45">
-                                    <Arc.Stroke>
-                                        <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,0%">
-                                            <GradientStop Color="#010101" Offset="0" />
-                                            <GradientStop Color="#363636" Offset="0.5" />
-                                            <GradientStop Color="#010101" Offset="1" />
-                                        </LinearGradientBrush>
-                                    </Arc.Stroke>
-                                </Arc>
-                                <Arc
-                                    Width="294"
-                                    Height="294"
-                                    StartAngle="0"
-                                    SweepAngle="360"
-                                    StrokeJoin="Round"
-                                    StrokeLineCap="Round"
-                                    StrokeThickness="4"
-                                    Stroke="Black" />
-                                <Arc
-                                    Width="310"
-                                    Height="310"
-                                    StartAngle="0"
-                                    SweepAngle="360"
-                                    StrokeJoin="Round"
-                                    StrokeLineCap="Round"
-                                    StrokeThickness="10"
-                                    Stroke="#C6CACD"
-                                    Opacity="0.1" />
-                            </Panel>
 
-                        </SplitView>
-                    </Border>
-                </TabItem>
-                <TabItem Header="VerticalSplitView">
-                    <Border
-                        BorderBrush="{DynamicResource SemiGrey1}"
-                        BorderThickness="1">
-                        <SplitView
-                            Name="SplitView2"
-                            Theme="{DynamicResource VerticalSplitView}"
-                            IsPaneOpen="{Binding #PaneOpenButton.IsChecked,Mode=TwoWay}"
-                            UseLightDismissOverlayMode="{Binding #UseLightDismissOverlayModeButton.IsChecked}"
-                            PanePlacement="{Binding #PanePlacementButton.IsChecked}"
-                            DisplayMode="{Binding #DisplayModeSelector.SelectedItem}"
-                            CompactPaneLength="{Binding #CompactPaneLengthSlider.Value}"
-                            OpenPaneLength="{Binding #OpenPaneLengthSlider.Value}">
-                            <SplitView.Background>
-                                <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
-                                    <GradientStop Color="#6b4c1b" Offset="0" />
-                                    <GradientStop Color="#291e10" Offset="1" />
-                                </LinearGradientBrush>
-                            </SplitView.Background>
-                            <SplitView.Pane>
-                                <Grid RowDefinitions="Auto,Auto,*">
-                                    <ToggleSwitch
-                                        Grid.Row="0"
-                                        Theme="{DynamicResource IconBorderlessToggleSwitch}"
-                                        Content="{StaticResource SemiIconSidebar}"
-                                        HorizontalAlignment="Left"
-                                        IsChecked="{Binding #SplitView2.IsPaneOpen}">
-                                    </ToggleSwitch>
-                                    <TextBlock
-                                        Grid.Row="1"
-                                        Margin="8,12"
-                                        FontWeight="Bold"
-                                        Text="Playlist" />
-                                    <ListBox
-                                        Grid.Row="2"
-                                        ItemsSource="{Binding Songs}" />
-                                </Grid>
-                            </SplitView.Pane>
-
-                            <Panel>
-                                <Panel.Styles>
-                                    <Style Selector="Image#AlbumCover2">
-                                        <Style.Animations>
-                                            <Animation IterationCount="Infinite" Duration="0:0:40">
-                                                <KeyFrame Cue="0%">
-                                                    <Setter Property="RotateTransform.Angle" Value="0" />
-                                                </KeyFrame>
-                                                <KeyFrame Cue="100%">
-                                                    <Setter Property="RotateTransform.Angle" Value="360" />
-                                                </KeyFrame>
-                                            </Animation>
-                                        </Style.Animations>
-                                    </Style>
-                                </Panel.Styles>
-                                <Image
-                                    Source="/Assets/WORLD.png"
-                                    Name="AlbumCover2"
-                                    Width="200"
-                                    Height="200" />
-                                <Arc
-                                    Width="290"
-                                    Height="290"
-                                    StartAngle="0"
-                                    SweepAngle="360"
-                                    StrokeJoin="Round"
-                                    StrokeLineCap="Round"
-                                    StrokeThickness="45">
-                                    <Arc.Stroke>
-                                        <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,0%">
-                                            <GradientStop Color="#010101" Offset="0" />
-                                            <GradientStop Color="#363636" Offset="0.5" />
-                                            <GradientStop Color="#010101" Offset="1" />
-                                        </LinearGradientBrush>
-                                    </Arc.Stroke>
-                                </Arc>
-                                <Arc
-                                    Width="294"
-                                    Height="294"
-                                    StartAngle="0"
-                                    SweepAngle="360"
-                                    StrokeJoin="Round"
-                                    StrokeLineCap="Round"
-                                    StrokeThickness="4"
-                                    Stroke="Black" />
-                                <Arc
-                                    Width="310"
-                                    Height="310"
-                                    StartAngle="0"
-                                    SweepAngle="360"
-                                    StrokeJoin="Round"
-                                    StrokeLineCap="Round"
-                                    StrokeThickness="10"
-                                    Stroke="#C6CACD"
-                                    Opacity="0.1" />
-                            </Panel>
-
-                        </SplitView>
-                    </Border>
-                </TabItem>
-            </TabControl>
         </Grid>
     </Border>
 </UserControl>

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

@@ -34,7 +34,7 @@ public class SplitViewDemoViewModel : ObservableObject
         "世界所有的烂漫",
     ];
 
-    public static ObservableCollection<SplitViewDisplayMode> DisplayModes { get; set; } =
+    public ObservableCollection<SplitViewDisplayMode> DisplayModes { get; set; } =
     [
         SplitViewDisplayMode.Inline,
         SplitViewDisplayMode.CompactInline,

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

@@ -11,122 +11,85 @@
     x:DataType="vm:TabControlDemoViewModel"
     mc:Ignorable="d">
     <ScrollViewer>
-        <StackPanel>
+        <StackPanel Spacing="20">
-            <Border
+            <Border Theme="{StaticResource CardBorder}">
-                Margin="8"
+                <TabControl TabStripPlacement="Top">
-                HorizontalAlignment="Left"
+                    <TabItem Content="Hello 1" Header="Tab 1" />
-                Theme="{StaticResource RadioButtonGroupBorder}">
+                    <TabItem Content="Hello 2" Header="Tab 2" />
-                <ListBox Name="place" Theme="{StaticResource ButtonRadioGroupListBox}">
+                    <TabItem Content="Hello 3" Header="Tab 3" />
-                    <Dock>Left</Dock>
+                    <TabItem Content="中文内容" Header="中文中文" />
-                    <Dock>Bottom</Dock>
+                    <TabItem
-                    <Dock>Right</Dock>
+                        Content="Hello 4"
-                    <Dock>Top</Dock>
+                        Header="Tab 4"
-                </ListBox>
+                        IsEnabled="False" />
+                </TabControl>
+            </Border>
+            <Border Theme="{StaticResource CardBorder}">
+                <TabControl TabStripPlacement="Left">
+                    <TabItem Content="Hello 1" Header="Tab 1" />
+                    <TabItem Content="Hello 2" Header="Tab 2" />
+                    <TabItem Content="Hello 3" Header="Tab 3" />
+                    <TabItem Content="中文内容" Header="中文中文" />
+                    <TabItem
+                        Content="Hello 4"
+                        Header="Tab 4"
+                        IsEnabled="False" />
+                </TabControl>
+            </Border>
+            <Border Theme="{StaticResource CardBorder}">
+                <TabControl TabStripPlacement="Right">
+                    <TabItem Content="Hello 1" Header="Tab 1" />
+                    <TabItem Content="Hello 2" Header="Tab 2" />
+                    <TabItem Content="Hello 3" Header="Tab 3" />
+                    <TabItem Content="中文内容" Header="中文中文" />
+                    <TabItem
+                        Content="Hello 4"
+                        Header="Tab 4"
+                        IsEnabled="False" />
+                </TabControl>
+            </Border>
+            <Border Theme="{StaticResource CardBorder}">
+                <TabControl TabStripPlacement="Bottom">
+                    <TabItem Content="Hello 1" Header="Tab 1" />
+                    <TabItem Content="Hello 2" Header="Tab 2" />
+                    <TabItem Content="Hello 3" Header="Tab 3" />
+                    <TabItem Content="中文内容" Header="中文中文" />
+                    <TabItem
+                        Content="Hello 4"
+                        Header="Tab 4"
+                        IsEnabled="False" />
+                </TabControl>
+            </Border>
+            <Border Theme="{StaticResource CardBorder}">
+                <TabStrip>
+                    <TabStripItem>Tab 1</TabStripItem>
+                    <TabStripItem>Tab 2</TabStripItem>
+                </TabStrip>
+            </Border>
+            <Border Height="300" Theme="{DynamicResource CardBorder}">
+                <TabControl
+                    ItemsSource="{Binding Items}"
+                    TabStripPlacement="Top"
+                    Theme="{DynamicResource ScrollTabControl}" />
+            </Border>
+            <Border Height="300" Theme="{DynamicResource CardBorder}">
+                <TabControl
+                    ItemsSource="{Binding Items}"
+                    TabStripPlacement="Left"
+                    Theme="{DynamicResource ScrollTabControl}" />
+            </Border>
+            <Border Height="300" Theme="{DynamicResource CardBorder}">
+                <TabControl
+                    ItemsSource="{Binding Items}"
+                    TabStripPlacement="Bottom"
+                    Theme="{DynamicResource ScrollTabControl}" />
+            </Border>
+            <Border Height="300" Theme="{DynamicResource CardBorder}">
+                <TabControl
+                    ItemsSource="{Binding Items}"
+                    TabStripPlacement="Right"
+                    Theme="{DynamicResource ScrollTabControl}" />
             </Border>
-            <TabControl Theme="{StaticResource LineTabControl}">
-                <TabItem Header="Default">
-                    <StackPanel>
-                        <StackPanel
-                            Margin="8"
-                            Orientation="Horizontal"
-                            Spacing="8">
-                            <TextBlock VerticalAlignment="Center" Text="ReverseSeparator" />
-                            <ToggleSwitch Name="reverse" Theme="{StaticResource SimpleToggleSwitch}" />
-                        </StackPanel>
-                        <Border MinHeight="150" Theme="{StaticResource CardBorder}">
-                            <TabControl Classes.ReverseSeparator="{Binding #reverse.IsChecked}" TabStripPlacement="{Binding #place.SelectedValue}">
-                                <TabItem Content="Hello 1" Header="Tab 1" />
-                                <TabItem Content="Hello 2" Header="Tab 2" />
-                                <TabItem Content="Hello 3" Header="Tab 3" />
-                                <TabItem Content="中文内容" Header="中文中文" />
-                                <TabItem
-                                    Content="Hello 4"
-                                    Header="Tab 4"
-                                    IsEnabled="False" />
-                            </TabControl>
-                        </Border>
-                        <Border Height="300" Theme="{StaticResource CardBorder}">
-                            <TabControl
-                                Classes.ReverseSeparator="{Binding #reverse.IsChecked}"
-                                ItemsSource="{Binding Items}"
-                                TabStripPlacement="{Binding #place.SelectedValue}"
-                                Theme="{StaticResource ScrollTabControl}" />
-                        </Border>
-                    </StackPanel>
-                </TabItem>
-                <TabItem Header="Line">
-                    <StackPanel>
-                        <Border MinHeight="150" Theme="{StaticResource CardBorder}">
-                            <TabControl TabStripPlacement="{Binding #place.SelectedValue}" Theme="{StaticResource LineTabControl}">
-                                <TabItem Content="Hello 1" Header="Tab 1" />
-                                <TabItem Content="Hello 2" Header="Tab 2" />
-                                <TabItem Content="Hello 3" Header="Tab 3" />
-                                <TabItem Content="中文内容" Header="中文中文" />
-                                <TabItem
-                                    Content="Hello 4"
-                                    Header="Tab 4"
-                                    IsEnabled="False" />
-                            </TabControl>
-                        </Border>
-                        <Border Height="300" Theme="{StaticResource CardBorder}">
-                            <TabControl
-                                ItemsSource="{Binding Items}"
-                                TabStripPlacement="{Binding #place.SelectedValue}"
-                                Theme="{StaticResource ScrollLineTabControl}" />
-                        </Border>
-                    </StackPanel>
-                </TabItem>
-                <TabItem Header="Card">
-                    <StackPanel>
-                        <Border
-                            MinHeight="150"
-                            Background="Transparent"
-                            Theme="{StaticResource CardBorder}">
-                            <TabControl TabStripPlacement="{Binding #place.SelectedValue}" Theme="{StaticResource CardTabControl}">
-                                <TabItem Content="Hello 1" Header="Tab 1" />
-                                <TabItem Content="Hello 2" Header="Tab 2" />
-                                <TabItem Content="Hello 3" Header="Tab 3" />
-                                <TabItem Content="中文内容" Header="中文中文" />
-                                <TabItem
-                                    Content="Hello 4"
-                                    Header="Tab 4"
-                                    IsEnabled="False" />
-                            </TabControl>
-                        </Border>
-                        <Border
-                            Height="300"
-                            Background="Transparent"
-                            Theme="{StaticResource CardBorder}">
-                            <TabControl
-                                ItemsSource="{Binding Items}"
-                                TabStripPlacement="{Binding #place.SelectedValue}"
-                                Theme="{StaticResource ScrollCardTabControl}" />
-                        </Border>
-                    </StackPanel>
-                </TabItem>
-                <TabItem Header="Button">
-                    <StackPanel>
-                        <Border MinHeight="150" Theme="{StaticResource CardBorder}">
-                            <TabControl TabStripPlacement="{Binding #place.SelectedValue}" Theme="{StaticResource ButtonTabControl}">
-                                <TabItem Content="Hello 1" Header="Tab 1" />
-                                <TabItem Content="Hello 2" Header="Tab 2" />
-                                <TabItem Content="Hello 3" Header="Tab 3" />
-                                <TabItem Content="中文内容" Header="中文中文" />
-                                <TabItem
-                                    Content="Hello 4"
-                                    Header="Tab 4"
-                                    IsEnabled="False" />
-                            </TabControl>
-                        </Border>
-                        <Border Height="300" Theme="{StaticResource CardBorder}">
-                            <TabControl
-                                ItemsSource="{Binding Items}"
-                                TabStripPlacement="{Binding #place.SelectedValue}"
-                                Theme="{StaticResource ScrollButtonTabControl}" />
-                        </Border>
-                    </StackPanel>
-                </TabItem>
-            </TabControl>
         </StackPanel>
     </ScrollViewer>
-</UserControl>
+</UserControl>

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

@@ -1,94 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Semi.Avalonia.Demo.Pages.TabStripDemo"
-             x:CompileBindings="True"
-             x:DataType="vm:TabStripDemoViewModel">
-    <Design.DataContext>
-        <vm:TabStripDemoViewModel />
-    </Design.DataContext>
-    <ScrollViewer>
-        <StackPanel>
-            <TabControl Theme="{StaticResource LineTabControl}">
-                <TabItem Header="Default">
-                    <StackPanel>
-                        <Border Theme="{StaticResource CardBorder}">
-                            <TabStrip>
-                                <TabStripItem Content="Tab 1" />
-                                <TabStripItem Content="Tab 2" />
-                                <TabStripItem Content="Tab 3" />
-                                <TabStripItem Content="中文中文" />
-                                <TabStripItem Content="Tab 4" IsEnabled="False" />
-                            </TabStrip>
-                        </Border>
-                        <Border Theme="{StaticResource CardBorder}">
-                            <TabStrip
-                                ItemsSource="{Binding Items}" />
-                        </Border>
-                    </StackPanel>
-                </TabItem>
-                <TabItem Header="Line">
-                    <StackPanel>
-                        <Border Theme="{StaticResource CardBorder}">
-                            <TabStrip Theme="{StaticResource LineTabStrip}">
-                                <TabStripItem Content="Tab 1" />
-                                <TabStripItem Content="Tab 2" />
-                                <TabStripItem Content="Tab 3" />
-                                <TabStripItem Content="中文中文" />
-                                <TabStripItem Content="Tab 4" IsEnabled="False" />
-                            </TabStrip>
-                        </Border>
-                        <Border Theme="{StaticResource CardBorder}">
-                            <TabStrip
-                                ItemsSource="{Binding Items}"
-                                Theme="{StaticResource LineTabStrip}" />
-                        </Border>
-                    </StackPanel>
-                </TabItem>
-                <TabItem Header="Card">
-                    <StackPanel>
-                        <Border
-                            Background="Transparent"
-                            Theme="{StaticResource CardBorder}">
-                            <TabStrip Theme="{StaticResource CardTabStrip}">
-                                <TabStripItem Content="Tab 1" />
-                                <TabStripItem Content="Tab 2" />
-                                <TabStripItem Content="Tab 3" />
-                                <TabStripItem Content="中文中文" />
-                                <TabStripItem Content="Tab 4" IsEnabled="False" />
-                            </TabStrip>
-                        </Border>
-                        <Border
-                            Background="Transparent"
-                            Theme="{StaticResource CardBorder}">
-                            <TabStrip
-                                ItemsSource="{Binding Items}"
-                                Theme="{StaticResource CardTabStrip}" />
-                        </Border>
-                    </StackPanel>
-                </TabItem>
-                <TabItem Header="Button">
-                    <StackPanel>
-                        <Border Theme="{StaticResource CardBorder}">
-                            <TabStrip Theme="{StaticResource ButtonTabStrip}">
-                                <TabStripItem Content="Tab 1" />
-                                <TabStripItem Content="Tab 2" />
-                                <TabStripItem Content="Tab 3" />
-                                <TabStripItem Content="中文中文" />
-                                <TabStripItem Content="Tab 4" IsEnabled="False" />
-                            </TabStrip>
-                        </Border>
-                        <Border Theme="{StaticResource CardBorder}">
-                            <TabStrip
-                                ItemsSource="{Binding Items}"
-                                Theme="{StaticResource ButtonTabStrip}" />
-                        </Border>
-                    </StackPanel>
-                </TabItem>
-            </TabControl>
-        </StackPanel>
-    </ScrollViewer>
-</UserControl>

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

@@ -1,13 +0,0 @@
-using Avalonia.Controls;
-using Semi.Avalonia.Demo.ViewModels;
-
-namespace Semi.Avalonia.Demo.Pages;
-
-public partial class TabStripDemo : UserControl
-{
-    public TabStripDemo()
-    {
-        InitializeComponent();
-        this.DataContext = new TabStripDemoViewModel();
-    }
-}

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

@@ -15,7 +15,6 @@
             <TextBox Width="300" Classes="revealPasswordButton" Text="123456" />
             <TextBox
                 Width="300"
-                IsReadOnly="True"
                 Classes="ClearButton RevealPasswordButton"
                 InnerLeftContent="https://"
                 InnerRightContent=".com"

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

@@ -20,7 +20,7 @@
         </StackPanel>
         <StackPanel Orientation="Horizontal">
             <ToggleSwitch Content="Switch" OnContent="Yes" OffContent="No" />
-            <ToggleSwitch Content="Switch" OnContent="Yes" OffContent="No" IsChecked="True" />
+            <ToggleSwitch Content="Switch" OnContent="Yes" OffContent="No" IsChecked="True"/>
             <ToggleSwitch Content="Switch" OnContent="Yes" OffContent="No" IsEnabled="False" />
             <ToggleSwitch Content="Switch" OnContent="Yes" OffContent="No" IsEnabled="False" IsChecked="True" />
         </StackPanel>
@@ -64,9 +64,7 @@
         <StackPanel Orientation="Horizontal">
             <ToggleSwitch
                 HorizontalAlignment="Left"
-                Padding="{StaticResource SemiThicknessTight}"
+                Padding="8"
-                Width="{StaticResource SemiSpacingExtraLoose}"
-                Height="{StaticResource SemiSpacingExtraLoose}"
                 Theme="{DynamicResource ButtonToggleSwitch}"
                 Foreground="{DynamicResource ButtonDefaultTertiaryForeground}">
                 <ToggleSwitch.Content>
@@ -77,9 +75,7 @@
             </ToggleSwitch>
             <ToggleSwitch
                 HorizontalAlignment="Left"
-                Padding="{StaticResource SemiThicknessTight}"
+                Padding="8"
-                Width="{StaticResource SemiSpacingExtraLoose}"
-                Height="{StaticResource SemiSpacingExtraLoose}"
                 Theme="{DynamicResource ButtonToggleSwitch}"
                 Foreground="{DynamicResource ButtonDefaultTertiaryForeground}">
                 <ToggleSwitch.OnContent>

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

@@ -1,127 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels"
-             xmlns:converters="clr-namespace:Semi.Avalonia.Demo.Converters"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Semi.Avalonia.Demo.Pages.TreeDataGridDemo"
-             x:CompileBindings="True"
-             x:DataType="vm:TreeDataGridDemoViewModel">
-    <UserControl.Resources>
-        <converters:FileIconConverter x:Key="FileIconConverter">
-            <StaticResource x:Key="file" ResourceKey="SemiIconFile" />
-            <StaticResource x:Key="folderOpen" ResourceKey="SemiIconFolderOpen" />
-            <StaticResource x:Key="folderClosed" ResourceKey="SemiIconFolder" />
-        </converters:FileIconConverter>
-    </UserControl.Resources>
-    <TabControl>
-        <TabItem Header="Songs">
-            <TreeDataGrid
-                AutoDragDropRows="True"
-                DataContext="{Binding SongsContext}"
-                Source="{Binding Songs}">
-                <TreeDataGrid.Resources>
-                    <DataTemplate x:Key="AlbumCell" DataType="vm:SongViewModel">
-                        <TextBlock
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            Text="{Binding Album}" />
-                    </DataTemplate>
-                    <DataTemplate x:Key="AlbumEditCell" DataType="vm:SongViewModel">
-                        <ComboBox
-                            VerticalAlignment="Center"
-                            Classes="Small"
-                            ItemsSource="{x:Static vm:Song.Albums}"
-                            SelectedItem="{Binding Album}" />
-                    </DataTemplate>
-                    <DataTemplate x:Key="CommentsCell" DataType="vm:SongViewModel">
-                        <TextBlock VerticalAlignment="Center" Text="{Binding CountOfComment}" />
-                    </DataTemplate>
-                    <DataTemplate x:Key="CommentsEditCell" DataType="vm:SongViewModel">
-                        <NumericUpDown
-                            Width="100"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Classes="Small"
-                            Value="{Binding CountOfComment}" />
-                    </DataTemplate>
-                </TreeDataGrid.Resources>
-                <TreeDataGrid.Styles>
-                    <Style Selector="TreeDataGrid TreeDataGridRow:nth-last-child(2n)">
-                        <Setter Property="Background" Value="{DynamicResource SemiColorFill0}" />
-                    </Style>
-                </TreeDataGrid.Styles>
-            </TreeDataGrid>
-        </TabItem>
-        <TabItem Header="Files">
-            <Grid DataContext="{Binding FilesContext}" RowDefinitions="Auto, *">
-                <DockPanel Margin="0,4" DockPanel.Dock="Top">
-                    <ComboBox
-                        DockPanel.Dock="Left"
-                        ItemsSource="{Binding Drives}"
-                        SelectedItem="{Binding SelectedDrive}" />
-                    <TextBox
-                        Margin="4,0,0,0"
-                        VerticalContentAlignment="Center"
-                        KeyDown="SelectedPath_KeyDown"
-                        Text="{Binding SelectedPath, Mode=OneWay}" />
-                </DockPanel>
-                <TreeDataGrid
-                    Name="fileViewer"
-                    Grid.Row="1"
-                    Source="{Binding Source}">
-                    <TreeDataGrid.Resources>
-
-                        <!--  Template for Name column cells  -->
-                        <DataTemplate x:Key="FileNameCell" DataType="vm:FileNodeViewModel">
-                            <StackPanel Orientation="Horizontal">
-                                <PathIcon
-                                    Theme="{StaticResource InnerPathIcon}"
-                                    Margin="8,0">
-                                    <PathIcon.Data>
-                                        <MultiBinding Converter="{StaticResource FileIconConverter}">
-                                            <Binding Path="IsDirectory" />
-                                            <Binding Path="IsExpanded" />
-                                        </MultiBinding>
-                                    </PathIcon.Data>
-                                </PathIcon>
-                                <TextBlock VerticalAlignment="Center" Text="{Binding Name}" />
-                            </StackPanel>
-                        </DataTemplate>
-
-                        <!--  Edit template for Name column cells  -->
-                        <DataTemplate x:Key="FileNameEditCell" DataType="vm:FileNodeViewModel">
-                            <StackPanel Orientation="Horizontal">
-                                <Image Margin="0,0,4,0" VerticalAlignment="Center">
-                                    <Image.Source>
-                                        <MultiBinding Converter="{StaticResource FileIconConverter}">
-                                            <Binding Path="IsDirectory" />
-                                            <Binding Path="IsExpanded" />
-                                        </MultiBinding>
-                                    </Image.Source>
-                                </Image>
-                                <TextBox
-                                    VerticalAlignment="Center"
-                                    Classes="Small"
-                                    Text="{Binding Name}">
-                                    <TextBox.Styles>
-                                        <Style Selector="DataValidationErrors">
-                                            <Setter Property="Theme" Value="{DynamicResource TooltipDataValidationErrors}" />
-                                        </Style>
-                                    </TextBox.Styles>
-                                </TextBox>
-                            </StackPanel>
-                        </DataTemplate>
-                    </TreeDataGrid.Resources>
-                    <TreeDataGrid.Styles>
-                        <Style Selector="TreeDataGrid TreeDataGridRow:nth-child(2n)">
-                            <Setter Property="Background" Value="{DynamicResource SemiColorFill0}" />
-                        </Style>
-                    </TreeDataGrid.Styles>
-                </TreeDataGrid>
-            </Grid>
-        </TabItem>
-    </TabControl>
-</UserControl>

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

@@ -1,23 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input;
-using Semi.Avalonia.Demo.ViewModels;
-
-namespace Semi.Avalonia.Demo.Pages;
-
-public partial class TreeDataGridDemo : UserControl
-{
-    public TreeDataGridDemo()
-    {
-        InitializeComponent();
-        this.DataContext = new TreeDataGridDemoViewModel();
-    }
-
-    private void SelectedPath_KeyDown(object? sender, KeyEventArgs e)
-    {
-        if (e.Key == Key.Enter)
-        {
-            var vm = DataContext as TreeDataGridDemoViewModel;
-            vm.FilesContext.SelectedPath = (sender as TextBox)!.Text;
-        }
-    }
-}

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

@@ -1,94 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels"
-             xmlns:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Semi.Avalonia.Demo.Pages.VariablesDemo"
-             x:DataType="vm:VariablesDemoViewModel"
-             x:CompileBindings="True">
-    <Design.DataContext>
-        <vm:VariablesDemoViewModel />
-    </Design.DataContext>
-    <DataGrid
-        Margin="8"
-        CanUserReorderColumns="True"
-        CanUserResizeColumns="True"
-        CanUserSortColumns="True"
-        HeadersVisibility="All"
-        IsReadOnly="True"
-        ItemsSource="{Binding GridData}">
-        <DataGrid.Columns>
-            <DataGridTemplateColumn
-                Width="300"
-                x:DataType="vm:VariableItem"
-                Header="ResourceKey">
-                <DataGridTemplateColumn.CellTemplate>
-                    <DataTemplate DataType="vm:VariableItem">
-                        <SelectableTextBlock
-                            Margin="12,0"
-                            VerticalAlignment="Center"
-                            Text="{Binding ResourceKey}" />
-                    </DataTemplate>
-                </DataGridTemplateColumn.CellTemplate>
-            </DataGridTemplateColumn>
-            <DataGridTemplateColumn
-                Width="200"
-                x:DataType="vm:VariableItem"
-                Header="Type">
-                <DataGridTemplateColumn.CellTemplate>
-                    <DataTemplate DataType="vm:VariableItem">
-                        <SelectableTextBlock
-                            Margin="12,0"
-                            VerticalAlignment="Center"
-                            Text="{Binding Type.Name}" />
-                    </DataTemplate>
-                </DataGridTemplateColumn.CellTemplate>
-            </DataGridTemplateColumn>
-            <DataGridTemplateColumn
-                Width="200"
-                x:DataType="vm:VariableItem"
-                Header="Value">
-                <DataGridTemplateColumn.CellTemplate>
-                    <DataTemplate DataType="vm:VariableItem">
-                        <SelectableTextBlock
-                            Margin="12,0"
-                            VerticalAlignment="Center"
-                            Text="{Binding Value}"
-                            TextWrapping="Wrap" />
-                    </DataTemplate>
-                </DataGridTemplateColumn.CellTemplate>
-            </DataGridTemplateColumn>
-            <DataGridTemplateColumn
-                Width="*"
-                x:DataType="vm:VariableItem"
-                Header="Description">
-                <DataGridTemplateColumn.CellTemplate>
-                    <DataTemplate DataType="vm:VariableItem">
-                        <SelectableTextBlock
-                            Margin="12,0"
-                            VerticalAlignment="Center"
-                            Text="{Binding Description}"
-                            TextWrapping="Wrap" />
-                    </DataTemplate>
-                </DataGridTemplateColumn.CellTemplate>
-            </DataGridTemplateColumn>
-            <DataGridTemplateColumn
-                Width="100"
-                x:DataType="vm:VariableItem"
-                Header="CopyText"
-                SortMemberPath="Duration">
-                <DataGridTemplateColumn.CellTemplate>
-                    <DataTemplate DataType="vm:VariableItem">
-                        <Button
-                            Command="{Binding $parent[pages:VariablesDemo].Copy}"
-                            CommandParameter="{Binding CopyText}"
-                            Theme="{DynamicResource  IconBorderlessButton}"
-                            Content="{StaticResource SemiIconCopy}" />
-                    </DataTemplate>
-                </DataGridTemplateColumn.CellTemplate>
-            </DataGridTemplateColumn>
-        </DataGrid.Columns>
-    </DataGrid>
-</UserControl>

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

@@ -1,24 +0,0 @@
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Semi.Avalonia.Demo.ViewModels;
-
-namespace Semi.Avalonia.Demo.Pages;
-
-public partial class VariablesDemo : UserControl
-{
-    public VariablesDemo()
-    {
-        InitializeComponent();
-        this.DataContext = new VariablesDemoViewModel();
-    }
-
-    public async Task Copy(object? o)
-    {
-        if (o is null) return;
-        var toplevel = TopLevel.GetTopLevel(this);
-        if (toplevel?.Clipboard is { } c)
-        {
-            await c.SetTextAsync(o.ToString());
-        }
-    }
-}

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

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>netstandard2.0</TargetFramework>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
@@ -12,7 +12,7 @@
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
         <PackageReference Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(DataGridVersion)"/>
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)"/>
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
             <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
@@ -22,9 +22,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\src\Semi.Avalonia\Semi.Avalonia.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.TreeDataGrid\Semi.Avalonia.TreeDataGrid.csproj"/>
+        <ProjectReference Include="..\..\src\Semi.Avalonia\Semi.Avalonia.csproj"/>
     </ItemGroup>
 </Project>

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

@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Semi.Avalonia.Demo.Controls"
     xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels"
-    xmlns:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
     x:CompileBindings="True"
     x:DataType="viewModels:FunctionalColorGroupViewModel">
     <ControlTheme x:Key="{x:Type controls:FunctionalColorGroupControl}" TargetType="controls:FunctionalColorGroupControl">
@@ -31,21 +30,27 @@
                                             </DataTemplate>
                                         </DataGridTemplateColumn.CellTemplate>
                                     </DataGridTemplateColumn>
-                                    <DataGridTemplateColumn Width="300" Header="ResourceKey">
+                                    <DataGridTemplateColumn Width="*" Header="ResourceKey">
                                         <DataGridTemplateColumn.CellTemplate>
                                             <DataTemplate DataType="viewModels:ColorItemViewModel">
                                                 <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
                                                     VerticalAlignment="Center"
                                                     Text="{Binding ResourceKey}" />
                                             </DataTemplate>
                                         </DataGridTemplateColumn.CellTemplate>
                                     </DataGridTemplateColumn>
+                                    <DataGridTextColumn
+                                        Width="*"
+                                        x:DataType="viewModels:ColorItemViewModel"
+                                        Binding="{Binding ColorDisplayName}"
+                                        CanUserSort="False"
+                                        Header="Name" />
                                     <DataGridTemplateColumn Width="100" Header="Hex">
                                         <DataGridTemplateColumn.CellTemplate>
                                             <DataTemplate DataType="viewModels:ColorItemViewModel">
                                                 <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
                                                     VerticalAlignment="Center"
                                                     Text="{Binding Hex}" />
                                             </DataTemplate>
@@ -55,29 +60,13 @@
                                         <DataGridTemplateColumn.CellTemplate>
                                             <DataTemplate DataType="viewModels:ColorItemViewModel">
                                                 <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
+                                                    HorizontalAlignment="Right"
                                                     VerticalAlignment="Center"
                                                     Text="{Binding Brush.Opacity}" />
                                             </DataTemplate>
                                         </DataGridTemplateColumn.CellTemplate>
                                     </DataGridTemplateColumn>
-                                    <DataGridTextColumn
-                                        Width="*"
-                                        x:DataType="viewModels:ColorItemViewModel"
-                                        Binding="{Binding ColorDisplayName}"
-                                        CanUserSort="False"
-                                        Header="Description" />
-                                    <DataGridTemplateColumn Width="100" Header="CopyText">
-                                        <DataGridTemplateColumn.CellTemplate>
-                                            <DataTemplate DataType="viewModels:ColorItemViewModel">
-                                                <Button
-                                                    Command="{Binding $parent[pages:PaletteDemo].Copy}"
-                                                    CommandParameter="{Binding CopyText}"
-                                                    Theme="{DynamicResource  IconBorderlessButton}"
-                                                    Content="{StaticResource SemiIconCopy}" />
-                                            </DataTemplate>
-                                        </DataGridTemplateColumn.CellTemplate>
-                                    </DataGridTemplateColumn>
                                 </DataGrid.Columns>
                             </DataGrid>
                         </TabItem>
@@ -95,21 +84,27 @@
                                             </DataTemplate>
                                         </DataGridTemplateColumn.CellTemplate>
                                     </DataGridTemplateColumn>
-                                    <DataGridTemplateColumn Width="300" Header="ResourceKey">
+                                    <DataGridTemplateColumn Width="*" Header="ResourceKey">
                                         <DataGridTemplateColumn.CellTemplate>
                                             <DataTemplate DataType="viewModels:ColorItemViewModel">
                                                 <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
                                                     VerticalAlignment="Center"
                                                     Text="{Binding ResourceKey}" />
                                             </DataTemplate>
                                         </DataGridTemplateColumn.CellTemplate>
                                     </DataGridTemplateColumn>
+                                    <DataGridTextColumn
+                                        Width="*"
+                                        x:DataType="viewModels:ColorItemViewModel"
+                                        Binding="{Binding ColorDisplayName}"
+                                        CanUserSort="False"
+                                        Header="Name" />
                                     <DataGridTemplateColumn Width="100" Header="Hex">
                                         <DataGridTemplateColumn.CellTemplate>
                                             <DataTemplate DataType="viewModels:ColorItemViewModel">
                                                 <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
                                                     VerticalAlignment="Center"
                                                     Text="{Binding Hex}" />
                                             </DataTemplate>
@@ -119,29 +114,13 @@
                                         <DataGridTemplateColumn.CellTemplate>
                                             <DataTemplate DataType="viewModels:ColorItemViewModel">
                                                 <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
+                                                    HorizontalAlignment="Right"
                                                     VerticalAlignment="Center"
                                                     Text="{Binding Brush.Opacity}" />
                                             </DataTemplate>
                                         </DataGridTemplateColumn.CellTemplate>
                                     </DataGridTemplateColumn>
-                                    <DataGridTextColumn
-                                        Width="*"
-                                        x:DataType="viewModels:ColorItemViewModel"
-                                        Binding="{Binding ColorDisplayName}"
-                                        CanUserSort="False"
-                                        Header="Description" />
-                                    <DataGridTemplateColumn Width="100" Header="CopyText">
-                                        <DataGridTemplateColumn.CellTemplate>
-                                            <DataTemplate DataType="viewModels:ColorItemViewModel">
-                                                <Button
-                                                    Command="{Binding $parent[pages:PaletteDemo].Copy}"
-                                                    CommandParameter="{Binding CopyText}"
-                                                    Theme="{DynamicResource  IconBorderlessButton}"
-                                                    Content="{StaticResource SemiIconCopy}" />
-                                            </DataTemplate>
-                                        </DataGridTemplateColumn.CellTemplate>
-                                    </DataGridTemplateColumn>
                                 </DataGrid.Columns>
                             </DataGrid>
                         </TabItem>

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

@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Semi.Avalonia.Demo.Controls"
     xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels"
-    xmlns:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
     x:CompileBindings="True"
     x:DataType="viewModels:ShadowGroupViewModel">
     <ControlTheme x:Key="{x:Type controls:ShadowGroupControl}" TargetType="controls:ShadowGroupControl">
@@ -20,40 +19,29 @@
                         <TabItem Header="Light">
                             <DataGrid IsReadOnly="True" ItemsSource="{TemplateBinding LightShadows}">
                                 <DataGrid.Columns>
-                                    <DataGridTemplateColumn Width="300" Header="ResourceKey">
+                                    <DataGridTemplateColumn Width="*" Header="ResourceKey">
                                         <DataGridTemplateColumn.CellTemplate>
                                             <DataTemplate DataType="viewModels:ShadowItemViewModel">
                                                 <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
                                                     VerticalAlignment="Center"
                                                     Text="{Binding ResourceKey}" />
                                             </DataTemplate>
                                         </DataGridTemplateColumn.CellTemplate>
                                     </DataGridTemplateColumn>
-                                    <DataGridTemplateColumn Width="300" Header="BoxShadows">
-                                        <DataGridTemplateColumn.CellTemplate>
-                                            <DataTemplate DataType="viewModels:ShadowItemViewModel">
-                                                <SelectableTextBlock
-                                                    Margin="12,0"
-                                                    VerticalAlignment="Center"
-                                                    Text="{Binding BoxShadowValue}" />
-                                            </DataTemplate>
-                                        </DataGridTemplateColumn.CellTemplate>
-                                    </DataGridTemplateColumn>
                                     <DataGridTextColumn
                                         Width="*"
                                         x:DataType="viewModels:ShadowItemViewModel"
                                         Binding="{Binding ShadowDisplayName}"
                                         CanUserSort="False"
-                                        Header="Description" />
+                                        Header="Name" />
-                                    <DataGridTemplateColumn Width="100" Header="CopyText">
+                                    <DataGridTemplateColumn Width="300" Header="BoxShadows">
                                         <DataGridTemplateColumn.CellTemplate>
                                             <DataTemplate DataType="viewModels:ShadowItemViewModel">
-                                                <Button
+                                                <SelectableTextBlock
-                                                    Command="{Binding $parent[pages:PaletteDemo].Copy}"
+                                                    Margin="12,0,12,0"
-                                                    CommandParameter="{Binding CopyText}"
+                                                    VerticalAlignment="Center"
-                                                    Theme="{DynamicResource  IconBorderlessButton}"
+                                                    Text="{Binding BoxShadowValue}" />
-                                                    Content="{StaticResource SemiIconCopy}" />
                                             </DataTemplate>
                                         </DataGridTemplateColumn.CellTemplate>
                                     </DataGridTemplateColumn>
@@ -63,40 +51,29 @@
                         <TabItem Header="Dark">
                             <DataGrid IsReadOnly="True" ItemsSource="{TemplateBinding DarkShadows}">
                                 <DataGrid.Columns>
-                                    <DataGridTemplateColumn Width="300" Header="ResourceKey">
+                                    <DataGridTemplateColumn Width="*" Header="ResourceKey">
                                         <DataGridTemplateColumn.CellTemplate>
                                             <DataTemplate DataType="viewModels:ShadowItemViewModel">
                                                 <SelectableTextBlock
-                                                    Margin="12,0"
+                                                    Margin="12,0,12,0"
                                                     VerticalAlignment="Center"
                                                     Text="{Binding ResourceKey}" />
                                             </DataTemplate>
                                         </DataGridTemplateColumn.CellTemplate>
                                     </DataGridTemplateColumn>
-                                    <DataGridTemplateColumn Width="300" Header="BoxShadows">
-                                        <DataGridTemplateColumn.CellTemplate>
-                                            <DataTemplate DataType="viewModels:ShadowItemViewModel">
-                                                <SelectableTextBlock
-                                                    Margin="12,0"
-                                                    VerticalAlignment="Center"
-                                                    Text="{Binding BoxShadowValue}" />
-                                            </DataTemplate>
-                                        </DataGridTemplateColumn.CellTemplate>
-                                    </DataGridTemplateColumn>
                                     <DataGridTextColumn
                                         Width="*"
                                         x:DataType="viewModels:ShadowItemViewModel"
                                         Binding="{Binding ShadowDisplayName}"
                                         CanUserSort="False"
-                                        Header="Description" />
+                                        Header="Name" />
-                                    <DataGridTemplateColumn Width="100" Header="CopyText">
+                                    <DataGridTemplateColumn Width="300" Header="BoxShadows">
                                         <DataGridTemplateColumn.CellTemplate>
                                             <DataTemplate DataType="viewModels:ShadowItemViewModel">
-                                                <Button
+                                                <SelectableTextBlock
-                                                    Command="{Binding $parent[pages:PaletteDemo].Copy}"
+                                                    Margin="12,0,12,0"
-                                                    CommandParameter="{Binding CopyText}"
+                                                    VerticalAlignment="Center"
-                                                    Theme="{DynamicResource  IconBorderlessButton}"
+                                                    Text="{Binding BoxShadowValue}" />
-                                                    Content="{StaticResource SemiIconCopy}" />
                                             </DataTemplate>
                                         </DataGridTemplateColumn.CellTemplate>
                                     </DataGridTemplateColumn>

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

@@ -0,0 +1,49 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="NavigationTab" TargetType="TabControl">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="TabControl">
+                <Border
+                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                    VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <DockPanel>
+                        <ScrollViewer
+                            DockPanel.Dock="Left"
+                            Name="PART_ScrollViewer"
+                            VerticalScrollBarVisibility="Auto">
+                            <Panel DockPanel.Dock="{TemplateBinding TabStripPlacement}">
+                                <ItemsPresenter Name="PART_ItemsPresenter">
+                                    <ItemsPresenter.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <StackPanel />
+                                        </ItemsPanelTemplate>
+                                    </ItemsPresenter.ItemsPanel>
+                                </ItemsPresenter>
+                                <Border Name="PART_BorderSeparator"
+                                        Background="{DynamicResource TabItemLinePipePressedBorderBrush}" />
+                            </Panel>
+                        </ScrollViewer>
+                        <ContentPresenter
+                            Name="PART_SelectedContentHost"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding SelectedContent}"
+                            ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
+                    </DockPanel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_BorderSeparator">
+            <Setter Property="Width" Value="1" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+        </Style>
+        <Style Selector="^.Dismiss /template/ ScrollViewer#PART_ScrollViewer">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -14,8 +14,6 @@
                   BasedOn="{StaticResource ButtonToggleSwitch}"
                   TargetType="ToggleSwitch">
         <Setter Property="Padding" Value="{StaticResource SemiThicknessTight}" />
-        <Setter Property="Width" Value="{StaticResource SemiSpacingExtraLoose}" />
-        <Setter Property="Height" Value="{StaticResource SemiSpacingExtraLoose}" />
         <Setter Property="Foreground" Value="{DynamicResource SemiColorText1}" />
         <Setter Property="OnContentTemplate">
             <StaticResource ResourceKey="GeometryDataTemplate" />
@@ -32,8 +30,6 @@
                   BasedOn="{StaticResource BorderlessButton}"
                   TargetType="Button">
         <Setter Property="Padding" Value="{StaticResource SemiThicknessTight}" />
-        <Setter Property="Width" Value="{StaticResource SemiSpacingExtraLoose}" />
-        <Setter Property="Height" Value="{StaticResource SemiSpacingExtraLoose}" />
         <Setter Property="Foreground" Value="{DynamicResource SemiColorText1}" />
         <Setter Property="ContentTemplate">
             <StaticResource ResourceKey="GeometryDataTemplate" />

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

@@ -4,6 +4,7 @@
         <ResourceInclude Source="ColorItemControl.axaml" />
         <ResourceInclude Source="FunctionalColorGroupControl.axaml" />
         <ResourceInclude Source="ShadowGroupControl.axaml" />
+        <ResourceInclude Source="TabMenu.axaml" />
         <ResourceInclude Source="ToggleSwitch.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>

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

@@ -8,14 +8,14 @@ using CommunityToolkit.Mvvm.Input;
 
 namespace Semi.Avalonia.Demo.ViewModels;
 
-public class DataGridDemoViewModel : ObservableObject
+public class DataGridDemoViewModel: ObservableObject
 {
     public ObservableCollection<Song> GridData1 { get; set; }
-
+    
     public DataGridCollectionView GridData2 { get; set; }
-
+    
     public ObservableCollection<SongViewModel> GridData3 { get; set; }
-
+    
     public RelayCommand AddCommand { get; set; }
 
     public DataGridDemoViewModel()
@@ -23,7 +23,7 @@ public class DataGridDemoViewModel : ObservableObject
         GridData1 = new ObservableCollection<Song>(Song.Songs);
         GridData2 = new DataGridCollectionView(Song.Songs);
         GridData2.GroupDescriptions.Add(new DataGridPathGroupDescription("Album"));
-        GridData3 = new ObservableCollection<SongViewModel>(Song.Songs.Take(10).Select(a => new SongViewModel()
+        GridData3 = new ObservableCollection<SongViewModel>(Song.Songs.Take(10).Select(a=>new SongViewModel()
         {
             Title = a.Title,
             Artist = a.Artist,
@@ -57,29 +57,11 @@ public class Song
         Album = album;
         CountOfComment = countOfComment;
         Url = $"https://music.163.com/song?id={netEaseId}";
+        
     }
 
-    public static List<string> Albums =>
+    public static List<Song> Songs { get; set; } = new List<Song>()
-    [
+    {
-        "A.S.I.A",
-        "饕餮人间",
-        "七步咙咚呛",
-        "大惊小怪",
-        "The ONE",
-        "以梦为马 (壮志骄阳版)",
-        "emo了",
-        "一眼万年",
-        "冲刺吧",
-        "爱的赏味期限",
-        "COSMIC ANTHEM / 手紙",
-        "世界晚安",
-        "明年也要好好长大",
-        "320万年前",
-        "W.O.R.L.D."
-    ];
-
-    public static List<Song> Songs =>
-    [
         new("好肚有肚(feat.李玲玉)", "熊猫堂ProducePandas", 2, 50, "A.S.I.A", 730, 1487039339),
         new("荒诞秀", "熊猫堂ProducePandas", 3, 15, "A.S.I.A", 639, 1487037601),
         new("长大", "熊猫堂ProducePandas", 4, 6, "A.S.I.A", 1114, 1487037690),
@@ -140,15 +122,41 @@ public class Song
         new("热带季风Remix", "熊猫堂ProducePandas", 3, 22, "W.O.R.L.D.", 23, 2063173319),
         new("加州梦境", "熊猫堂ProducePandas", 2, 56, "W.O.R.L.D.", 1662, 2063173324),
         new("渐近自由", "熊猫堂ProducePandas", 4, 19, "W.O.R.L.D.", 124, 2063173321),
-        new("世界所有的烂漫", "熊猫堂ProducePandas", 3, 30, "W.O.R.L.D.", 335, 2053388775)
+        new("世界所有的烂漫", "熊猫堂ProducePandas", 3, 30, "W.O.R.L.D.", 335, 2053388775),
-    ];
+    };
 }
 
-public partial class SongViewModel : ObservableObject
+public class SongViewModel: ObservableObject
 {
-    [ObservableProperty] private string? _title;
+    private string? _title;
-    [ObservableProperty] private string? _artist;
+    private string? _artist;
-    [ObservableProperty] private string? _album;
+    private string? _album;
-    [ObservableProperty] private int _countOfComment;
+    private int _countOfComment;
-    [ObservableProperty] private bool? _isSelected;
+    private bool? _isSelected;
+    public string? Title
+    {
+        get => _title;
+        set => SetProperty(ref _title, value);
+    }
+    public string? Artist
+    {
+        get => _artist;
+        set => SetProperty(ref _artist, value);
+    }
+    public string? Album
+    {
+        get => _album;
+        set => SetProperty(ref _album, value);
+    }
+    public int CountOfComment
+    {
+        get => _countOfComment;
+        set => SetProperty(ref _countOfComment, value);
+    }
+    public bool? IsSelected
+    {
+        get => _isSelected;
+        set => SetProperty(ref _isSelected, value);
+    }
+    
 }

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

@@ -31,35 +31,35 @@ public partial class HighContrastDemoViewModel : ObservableObject
         [
             new ColorResource
             {
-                ResourceKey = "SemiColorWindow",
+                ResourceKey = "WindowColor",
                 Brush = new SolidColorBrush(Color.Parse("#202020")),
                 Description = "Background of pages, panes, popups, and windows.",
                 PairWith = "WindowTextColor"
             },
             new ColorResource
             {
-                ResourceKey = "SemiColorWindowText",
+                ResourceKey = "WindowTextColor",
                 Brush = new SolidColorBrush(Color.Parse("#FFFFFF")),
                 Description = "Headings, body copy, lists, placeholder text, app and window borders.",
                 PairWith = "WindowColor"
             },
             new ColorResource
             {
-                ResourceKey = "SemiColorHotlight",
+                ResourceKey = "HotlightColor",
                 Brush = new SolidColorBrush(Color.Parse("#75E9FC")),
                 Description = "Hyperlinks.",
                 PairWith = "WindowColor"
             },
             new ColorResource
             {
-                ResourceKey = "SemiColorGrayText",
+                ResourceKey = "GrayTextColor",
                 Brush = new SolidColorBrush(Color.Parse("#A6A6A6")),
                 Description = "Inactive (disabled) UI.",
                 PairWith = "WindowColor"
             },
             new ColorResource
             {
-                ResourceKey = "SemiColorHighlightText",
+                ResourceKey = "HighlightTextColor",
                 Brush = new SolidColorBrush(Color.Parse("#263B50")),
                 Description =
                     "Foreground color for text or UI that is in selected, interacted with (hover, pressed), or in progress.",
@@ -67,7 +67,7 @@ public partial class HighContrastDemoViewModel : ObservableObject
             },
             new ColorResource
             {
-                ResourceKey = "SemiColorHighlight",
+                ResourceKey = "HighlightColor",
                 Brush = new SolidColorBrush(Color.Parse("#8EE3F0")),
                 Description =
                     "Background or accent color for UI that is in selected, interacted with (hover, pressed), or in progress.",
@@ -75,14 +75,14 @@ public partial class HighContrastDemoViewModel : ObservableObject
             },
             new ColorResource
             {
-                ResourceKey = "SemiColorButtonText",
+                ResourceKey = "ButtonTextColor",
                 Brush = new SolidColorBrush(Color.Parse("#FFFFFF")),
                 Description = "Foreground color for buttons and any UI that can be interacted with.",
                 PairWith = "ButtonFaceColor"
             },
             new ColorResource
             {
-                ResourceKey = "SemiColorButtonFace",
+                ResourceKey = "ButtonFaceColor",
                 Brush = new SolidColorBrush(Color.Parse("#202020")),
                 Description = "Background color for buttons and any UI that can be interacted with.",
                 PairWith = "ButtonTextColor"
@@ -100,10 +100,9 @@ public partial class HighContrastDemoViewModel : ObservableObject
         foreach (var colorResource in ColorResources)
         {
             if (colorResource.ResourceKey is null) continue;
-            if (topLevel?.TryFindResource(colorResource.ResourceKey, value, out var o) == true
+            if (topLevel?.TryFindResource(colorResource.ResourceKey, value, out var o) == true && o is Color color)
-                && o is ISolidColorBrush color)
             {
-                colorResource.Brush = color;
+                colorResource.Brush = new SolidColorBrush(color);
             }
         }
     }
@@ -122,12 +121,7 @@ public partial class HighContrastDemoViewModel : ObservableObject
 public partial class ColorResource : ObservableObject
 {
     [ObservableProperty] private string? _resourceKey;
-    [ObservableProperty] private ISolidColorBrush? _brush;
+    [ObservableProperty] private SolidColorBrush? _brush;
     [ObservableProperty] private string? _description;
     [ObservableProperty] private string? _pairWith;
-
-    public string CopyText =>
-        $"""
-         <StaticResource x:Key="" ResourceKey="{ResourceKey}" />
-         """;
 }

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

@@ -6,13 +6,12 @@ using Avalonia.Controls;
 using Avalonia.Media;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
-using Semi.Avalonia.Demo.Constant;
-using Semi.Avalonia.Demo.Converters;
 using Semi.Avalonia.Tokens.Palette;
+using Semi.Avalonia.Demo.Converters;
 
 namespace Semi.Avalonia.Demo.ViewModels;
 
-public partial class PaletteDemoViewModel : ObservableObject
+public class PaletteDemoViewModel : ObservableObject
 {
     private readonly string[] _predefinedColorNames =
     [
@@ -25,10 +24,31 @@ public partial class PaletteDemoViewModel : ObservableObject
     private readonly IResourceDictionary? _lightResourceDictionary;
     private readonly IResourceDictionary? _darkResourceDictionary;
 
-    [ObservableProperty] private ColorItemViewModel? _selectedColor;
+    private ColorItemViewModel _selectedColor = null!;
+
+    public ColorItemViewModel SelectedColor
+    {
+        get => _selectedColor;
+        set => SetProperty(ref _selectedColor, value);
+    }
+
+
+    private ObservableCollection<ColorListViewModel>? _lightLists;
+
+    public ObservableCollection<ColorListViewModel>? LightLists
+    {
+        get => _lightLists;
+        set => SetProperty(ref _lightLists, value);
+    }
+
+    private ObservableCollection<ColorListViewModel>? _darkLists;
+
+    public ObservableCollection<ColorListViewModel>? DarkLists
+    {
+        get => _darkLists;
+        set => SetProperty(ref _darkLists, value);
+    }
 
-    public ObservableCollection<ColorListViewModel> LightLists { get; set; } = [];
-    public ObservableCollection<ColorListViewModel> DarkLists { get; set; } = [];
     public ObservableCollection<FunctionalColorGroupViewModel> FunctionalColors { get; set; } = [];
     public ObservableCollection<ShadowGroupViewModel> Shadows { get; set; } = [];
 
@@ -36,7 +56,7 @@ public partial class PaletteDemoViewModel : ObservableObject
     {
         _lightResourceDictionary = new Light();
         _darkResourceDictionary = new Dark();
-        WeakReferenceMessenger.Default.Register<ColorItemViewModel>(this, (_, item) => SelectedColor = item);
+        WeakReferenceMessenger.Default.Register<PaletteDemoViewModel, ColorItemViewModel>(this, OnClickColorItem);
     }
 
     public void InitializeResources()
@@ -48,6 +68,7 @@ public partial class PaletteDemoViewModel : ObservableObject
 
     private void InitializePalette()
     {
+        LightLists = [];
         foreach (var color in _predefinedColorNames)
         {
             ColorListViewModel s = new ColorListViewModel();
@@ -55,6 +76,7 @@ public partial class PaletteDemoViewModel : ObservableObject
             LightLists.Add(s);
         }
 
+        DarkLists = [];
         foreach (var color in _predefinedColorNames)
         {
             ColorListViewModel s = new ColorListViewModel();
@@ -65,82 +87,126 @@ public partial class PaletteDemoViewModel : ObservableObject
 
     private void InitializeFunctionalColors()
     {
-        FunctionalColors.Add(new FunctionalColorGroupViewModel(
+        FunctionalColors.Add(new FunctionalColorGroupViewModel("Primary", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.PrimaryTokens));
-            "Primary", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.PrimaryTokens));
+        FunctionalColors.Add(new FunctionalColorGroupViewModel("Secondary", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.SecondaryTokens));
-        FunctionalColors.Add(new FunctionalColorGroupViewModel(
+        FunctionalColors.Add(new FunctionalColorGroupViewModel("Tertiary", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.TertiaryTokens));
-            "Secondary", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.SecondaryTokens));
+        FunctionalColors.Add(new FunctionalColorGroupViewModel("Information", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.InformationTokens));
-        FunctionalColors.Add(new FunctionalColorGroupViewModel(
+        FunctionalColors.Add(new FunctionalColorGroupViewModel("Success", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.SuccessTokens));
-            "Tertiary", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.TertiaryTokens));
+        FunctionalColors.Add(new FunctionalColorGroupViewModel("Warning", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.WarningTokens));
-        FunctionalColors.Add(new FunctionalColorGroupViewModel(
+        FunctionalColors.Add(new FunctionalColorGroupViewModel("Danger", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.DangerTokens));
-            "Information", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.InformationTokens));
+        FunctionalColors.Add(new FunctionalColorGroupViewModel("Text", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.TextTokens));
-        FunctionalColors.Add(new FunctionalColorGroupViewModel(
+        FunctionalColors.Add(new FunctionalColorGroupViewModel("Link", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.LinkTokens));
-            "Success", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.SuccessTokens));
+        FunctionalColors.Add(new FunctionalColorGroupViewModel("Background", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.BackgroundTokens));
-        FunctionalColors.Add(new FunctionalColorGroupViewModel(
+        FunctionalColors.Add(new FunctionalColorGroupViewModel("Fill", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.FillTokens));
-            "Warning", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.WarningTokens));
+        FunctionalColors.Add(new FunctionalColorGroupViewModel("Border", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.BorderTokens));
-        FunctionalColors.Add(new FunctionalColorGroupViewModel(
+        FunctionalColors.Add(new FunctionalColorGroupViewModel("Disabled", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.DisabledTokens));
-            "Danger", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.DangerTokens));
-        FunctionalColors.Add(new FunctionalColorGroupViewModel(
-            "Text", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.TextTokens));
-        FunctionalColors.Add(new FunctionalColorGroupViewModel(
-            "Link", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.LinkTokens));
-        FunctionalColors.Add(new FunctionalColorGroupViewModel(
-            "Background", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.BackgroundTokens));
-        FunctionalColors.Add(new FunctionalColorGroupViewModel(
-            "Fill", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.FillTokens));
-        FunctionalColors.Add(new FunctionalColorGroupViewModel(
-            "Border", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.BorderTokens));
-        FunctionalColors.Add(new FunctionalColorGroupViewModel(
-            "Disabled", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.DisabledTokens));
-        FunctionalColors.Add(new FunctionalColorGroupViewModel(
-            "Others", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.OtherTokens));
     }
 
     private void InitializeShadows()
     {
-        Shadows.Add(new ShadowGroupViewModel(
+        Shadows.Add(new ShadowGroupViewModel("Shadow", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.ShadowTokens));
-            "Shadow", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.ShadowTokens));
+    }
+
+    private void OnClickColorItem(PaletteDemoViewModel vm, ColorItemViewModel item)
+    {
+        SelectedColor = item;
     }
 }
 
-public partial class ColorListViewModel : ObservableObject
+public class ColorListViewModel : ObservableObject
 {
-    public ObservableCollection<ColorItemViewModel> Color { get; set; } = [];
+    private ObservableCollection<ColorItemViewModel>? _colors;
 
-    [ObservableProperty] private string? _seriesName;
+    public ObservableCollection<ColorItemViewModel>? Color
+    {
+        get => _colors;
+        set => SetProperty(ref _colors, value);
+    }
+
+    private string? _seriesName;
+
+    public string? SeriesName
+    {
+        get => _seriesName;
+        set => SetProperty(ref _seriesName, value);
+    }
 
     internal void Initialize(IResourceDictionary? resourceDictionary, string color, bool light)
     {
-        if (resourceDictionary is null) return;
+        if (resourceDictionary is null)
+        {
+            return;
+        }
 
         SeriesName = color;
+        Color = [];
 
         for (var i = 0; i < 10; i++)
         {
-            var key = $"Semi{color}{i}";
+            var key = "Semi" + color + i;
-            if (resourceDictionary.TryGetValue(key, out var value) && value is ISolidColorBrush brush)
+            if (resourceDictionary.TryGetValue(key, out var value))
             {
-                var name = $"{color} {i}";
+                if (value is ISolidColorBrush brush)
-                var item = new ColorItemViewModel(name, brush, key, light, i);
+                {
-                item.ColorResourceKey = $"{item.ResourceKey}Color";
+                    string name = color + " " + i;
-                Color.Add(item);
+                    var item = new ColorItemViewModel(name, brush, key, light, i);
+                    item.ColorResourceKey = item.ResourceKey + "Color";
+                    Color.Add(item);
+                }
             }
         }
     }
 }
 
-public partial class ColorItemViewModel : ObservableObject
+public class ColorItemViewModel : ObservableObject
 {
-    [ObservableProperty] private IBrush? _brush;
+    private IBrush _brush = null!;
-    [ObservableProperty] private IBrush? _textBrush;
-    [ObservableProperty] private string? _colorDisplayName;
-    [ObservableProperty] private string? _resourceKey;
-    [ObservableProperty] private string? _colorResourceKey;
-    [ObservableProperty] private string? _hex;
 
-    public string CopyText =>
+    public IBrush Brush
-        $"""
+    {
-         <StaticResource x:Key="" ResourceKey="{ResourceKey}" />
+        get => _brush;
-         """;
+        set => SetProperty(ref _brush, value);
+    }
+
+    private IBrush _textBrush = null!;
+
+    public IBrush TextBrush
+    {
+        get => _textBrush;
+        set => SetProperty(ref _textBrush, value);
+    }
+
+    private string _colorDisplayName = null!;
+
+    public string ColorDisplayName
+    {
+        get => _colorDisplayName;
+        set => SetProperty(ref _colorDisplayName, value);
+    }
+
+    private string _resourceKey = null!;
+
+    public string ResourceKey
+    {
+        get => _resourceKey;
+        set => SetProperty(ref _resourceKey, value);
+    }
+
+    private string _colorResourceKey = null!;
+
+    public string ColorResourceKey
+    {
+        get => _colorResourceKey;
+        set => SetProperty(ref _colorResourceKey, value);
+    }
+
+    private string _hex = null!;
+
+    public string Hex
+    {
+        get => _hex;
+        set => SetProperty(ref _hex, value);
+    }
 
     public ColorItemViewModel(string colorDisplayName, ISolidColorBrush brush, string resourceKey, bool light,
         int index)
@@ -161,9 +227,16 @@ public partial class ColorItemViewModel : ObservableObject
     }
 }
 
-public partial class FunctionalColorGroupViewModel : ObservableObject
+public class FunctionalColorGroupViewModel : ObservableObject
 {
-    [ObservableProperty] private string? _title;
+    private string _title = null!;
+
+    public string Title
+    {
+        get => _title;
+        set => SetProperty(ref _title, value);
+    }
+
     public ObservableCollection<ColorItemViewModel> LightColors { get; set; } = [];
     public ObservableCollection<ColorItemViewModel> DarkColors { get; set; } = [];
 
@@ -192,16 +265,31 @@ public partial class FunctionalColorGroupViewModel : ObservableObject
     }
 }
 
-public partial class ShadowItemViewModel : ObservableObject
+public class ShadowItemViewModel : ObservableObject
 {
-    [ObservableProperty] private string? _shadowDisplayName;
+    private string _shadowDisplayName = null!;
-    [ObservableProperty] private string? _resourceKey;
-    [ObservableProperty] private string? _boxShadowValue;
 
-    public string CopyText =>
+    public string ShadowDisplayName
-        $"""
+    {
-         <StaticResource x:Key="" ResourceKey="{ResourceKey}" />
+        get => _shadowDisplayName;
-         """;
+        set => SetProperty(ref _shadowDisplayName, value);
+    }
+
+    private string _resourceKey = null!;
+
+    public string ResourceKey
+    {
+        get => _resourceKey;
+        set => SetProperty(ref _resourceKey, value);
+    }
+
+    private string _boxShadowValue = null!;
+
+    public string BoxShadowValue
+    {
+        get => _boxShadowValue;
+        set => SetProperty(ref _boxShadowValue, value);
+    }
 
     public ShadowItemViewModel(string shadowDisplayName, BoxShadows boxShadows, string resourceKey)
     {
@@ -211,9 +299,16 @@ public partial class ShadowItemViewModel : ObservableObject
     }
 }
 
-public partial class ShadowGroupViewModel : ObservableObject
+public class ShadowGroupViewModel : ObservableObject
 {
-    [ObservableProperty] private string? _title;
+    private string _title = null!;
+
+    public string Title
+    {
+        get => _title;
+        set => SetProperty(ref _title, value);
+    }
+
     public ObservableCollection<ShadowItemViewModel> LightShadows { get; set; } = [];
     public ObservableCollection<ShadowItemViewModel> DarkShadows { get; set; } = [];
 
@@ -241,4 +336,132 @@ public partial class ShadowGroupViewModel : ObservableObject
             }
         }
     }
+}
+
+public static class ColorTokens
+{
+    public static IReadOnlyList<Tuple<string, string>> PrimaryTokens { get; } = new List<Tuple<string, string>>
+    {
+        new("SemiColorPrimary", "Primary"),
+        new("SemiColorPrimaryPointerover", "Primary Pointerover"),
+        new("SemiColorPrimaryActive", "Primary Active"),
+        new("SemiColorPrimaryDisabled", "Primary Disabled"),
+        new("SemiColorPrimaryLight", "Primary Light"),
+        new("SemiColorPrimaryLightPointerover", "Primary Light Pointerover"),
+        new("SemiColorPrimaryLightActive", "Primary Light Active"),
+    };
+
+    public static IReadOnlyList<Tuple<string, string>> SecondaryTokens { get; } = new List<Tuple<string, string>>
+    {
+        new("SemiColorSecondary", "Secondary"),
+        new("SemiColorSecondaryPointerover", "Secondary Pointerover"),
+        new("SemiColorSecondaryActive", "Secondary Active"),
+        new("SemiColorSecondaryDisabled", "Secondary Disabled"),
+        new("SemiColorSecondaryLight", "Secondary Light"),
+        new("SemiColorSecondaryLightPointerover", "Secondary Light Pointerover"),
+        new("SemiColorSecondaryLightActive", "Secondary Light Active"),
+    };
+
+    public static IReadOnlyList<Tuple<string, string>> TertiaryTokens { get; } = new List<Tuple<string, string>>
+    {
+        new("SemiColorTertiary", "Tertiary"),
+        new("SemiColorTertiaryPointerover", "Tertiary Pointerover"),
+        new("SemiColorTertiaryActive", "Tertiary Active"),
+        new("SemiColorTertiaryLight", "Tertiary Light"),
+        new("SemiColorTertiaryLightPointerover", "Tertiary Light Pointerover"),
+        new("SemiColorTertiaryLightActive", "Tertiary Light Active"),
+    };
+
+    public static IReadOnlyList<Tuple<string, string>> InformationTokens { get; } = new List<Tuple<string, string>>
+    {
+        new("SemiColorInformation", "Information"),
+        new("SemiColorInformationPointerover", "Information Pointerover"),
+        new("SemiColorInformationActive", "Information Active"),
+        new("SemiColorInformationDisabled", "Information Disabled"),
+        new("SemiColorInformationLight", "Information Light"),
+        new("SemiColorInformationLightPointerover", "Information Light Pointerover"),
+        new("SemiColorInformationLightActive", "Information Light Active"),
+    };
+
+    public static IReadOnlyList<Tuple<string, string>> SuccessTokens { get; } = new List<Tuple<string, string>>
+    {
+        new("SemiColorSuccess", "Success"),
+        new("SemiColorSuccessPointerover", "Success Pointerover"),
+        new("SemiColorSuccessActive", "Success Active"),
+        new("SemiColorSuccessDisabled", "Success Disabled"),
+        new("SemiColorSuccessLight", "Success Light"),
+        new("SemiColorSuccessLightPointerover", "Success Light Pointerover"),
+        new("SemiColorSuccessLightActive", "Success Light Active"),
+    };
+
+    public static IReadOnlyList<Tuple<string, string>> WarningTokens { get; } = new List<Tuple<string, string>>
+    {
+        new("SemiColorWarning", "Warning"),
+        new("SemiColorWarningPointerover", "Warning Pointerover"),
+        new("SemiColorWarningActive", "Warning Active"),
+        new("SemiColorWarningLight", "Warning Light"),
+        new("SemiColorWarningLightPointerover", "Warning Light Pointerover"),
+        new("SemiColorWarningLightActive", "Warning Light Active"),
+    };
+
+    public static IReadOnlyList<Tuple<string, string>> DangerTokens { get; } = new List<Tuple<string, string>>
+    {
+        new("SemiColorDanger", "Danger"),
+        new("SemiColorDangerPointerover", "Danger Pointerover"),
+        new("SemiColorDangerActive", "Danger Active"),
+        new("SemiColorDangerLight", "Danger Light"),
+        new("SemiColorDangerLightPointerover", "Danger Light Pointerover"),
+        new("SemiColorDangerLightActive", "Danger Light Active"),
+    };
+
+    public static IReadOnlyList<Tuple<string, string>> TextTokens { get; } = new List<Tuple<string, string>>
+    {
+        new("SemiColorText0", "Text 0"),
+        new("SemiColorText1", "Text 1"),
+        new("SemiColorText2", "Text 2"),
+        new("SemiColorText3", "Text 3"),
+    };
+
+    public static IReadOnlyList<Tuple<string, string>> LinkTokens { get; } = new List<Tuple<string, string>>
+    {
+        new("SemiColorLink", "Link"),
+        new("SemiColorLinkPointerover", "Link Pointerover"),
+        new("SemiColorLinkActive", "Link Active"),
+        new("SemiColorLinkVisited", "Link Visited"),
+    };
+
+    public static IReadOnlyList<Tuple<string, string>> BackgroundTokens { get; } = new List<Tuple<string, string>>
+    {
+        new("SemiColorBackground0", "Background 0"),
+        new("SemiColorBackground1", "Background 1"),
+        new("SemiColorBackground2", "Background 2"),
+        new("SemiColorBackground3", "Background 3"),
+        new("SemiColorBackground4", "Background 4"),
+    };
+
+    public static IReadOnlyList<Tuple<string, string>> FillTokens { get; } = new List<Tuple<string, string>>
+    {
+        new("SemiColorFill0", "Fill 0"),
+        new("SemiColorFill1", "Fill 1"),
+        new("SemiColorFill2", "Fill 2"),
+    };
+
+    public static IReadOnlyList<Tuple<string, string>> BorderTokens { get; } = new List<Tuple<string, string>>
+    {
+        new("SemiColorBorder", "Border"),
+    };
+
+    public static IReadOnlyList<Tuple<string, string>> DisabledTokens { get; } = new List<Tuple<string, string>>
+    {
+        new("SemiColorDisabledText", "Disabled Text"),
+        new("SemiColorDisabledBorder", "Disabled Border"),
+        new("SemiColorDisabledBackground", "Disabled Background"),
+        new("SemiColorDisabledFill", "Disabled Fill"),
+    };
+
+    public static IReadOnlyList<Tuple<string, string>> ShadowTokens { get; } = new List<Tuple<string, string>>
+    {
+        new("SemiColorShadow", "Shadow"),
+        new("SemiShadowElevated", "Shadow Elevated"),
+    };
 }

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

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

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

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

demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/SongsPageViewModel.cs

@@ -1,54 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Controls.Models.TreeDataGrid;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace Semi.Avalonia.Demo.ViewModels;
-
-public class SongsPageViewModel : ObservableObject
-{
-    public FlatTreeDataGridSource<SongViewModel> Songs { get; }
-
-    public SongsPageViewModel()
-    {
-        var songs = new ObservableCollection<SongViewModel>(Song.Songs.Select(a => new SongViewModel()
-        {
-            Title = a.Title,
-            Artist = a.Artist,
-            Album = a.Album,
-            CountOfComment = a.CountOfComment,
-            IsSelected = false
-        }));
-
-        Songs = new FlatTreeDataGridSource<SongViewModel>(songs)
-        {
-            Columns =
-            {
-                new CheckBoxColumn<SongViewModel>(
-                    "IsSelected",
-                    a => a.IsSelected, 
-                    (model, b) => { model.IsSelected = b; },
-                    new GridLength(108, GridUnitType.Pixel)),
-                new TextColumn<SongViewModel, string>(
-                    "Title", 
-                    a => a.Title, 
-                    (o, a) => o.Title = a,
-                    new GridLength(6, GridUnitType.Star)),
-                new TextColumn<SongViewModel, string>("Artist", 
-                    a => a.Artist, 
-                    (o, a) => o.Artist = a,
-                    new GridLength(6, GridUnitType.Star)),
-                new TemplateColumn<SongViewModel>("Album", 
-                    "AlbumCell", 
-                    "AlbumEditCell",
-                    new GridLength(6, GridUnitType.Star)),
-                new TemplateColumn<SongViewModel>(
-                    "Comments", 
-                    "CommentsCell", 
-                    "CommentsEditCell",
-                    new GridLength(6, GridUnitType.Star)),
-            }
-        };
-    }
-}

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

@@ -1,123 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Avalonia;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Media;
-using CommunityToolkit.Mvvm.ComponentModel;
-using Semi.Avalonia.Tokens;
-
-namespace Semi.Avalonia.Demo.ViewModels;
-
-public class VariablesDemoViewModel : ObservableObject
-{
-    public DataGridCollectionView GridData { get; set; }
-
-    public VariablesDemoViewModel()
-    {
-        IResourceDictionary dictionary = new Variables();
-        foreach (var token in Tokens)
-        {
-            if (token.ResourceKey is not null && dictionary.TryGetValue(token.ResourceKey, out var value))
-            {
-                token.Type = value?.GetType();
-                token.Value = GetValueString(value);
-            }
-        }
-
-        GridData = new DataGridCollectionView(Tokens);
-        GridData.GroupDescriptions.Add(new DataGridPathGroupDescription(nameof(VariableItem.Category)));
-    }
-
-    private static string GetValueString(object? value)
-    {
-        if (value is null) return string.Empty;
-
-        return value switch
-        {
-            double d => d.ToString(CultureInfo.InvariantCulture),
-            CornerRadius c => c.IsUniform ? $"{c.TopLeft}" : c.ToString(),
-            Thickness t => t.IsUniform ? $"{t.Left}" : t.ToString(),
-            FontWeight fontWeight => Convert.ToInt32(fontWeight).ToString(),
-            FontFamily fontFamily => fontFamily.FamilyNames.ToString(),
-            _ => value.ToString()
-        };
-    }
-
-    private static List<VariableItem> Tokens { get; set; } =
-    [
-        new("Height", "SemiHeightControlSmall"),
-        new("Height", "SemiHeightControlDefault"),
-        new("Height", "SemiHeightControlLarge"),
-        new("Icon Size", "SemiWidthIconExtraSmall"),
-        new("Icon Size", "SemiWidthIconSmall"),
-        new("Icon Size", "SemiWidthIconMedium"),
-        new("Icon Size", "SemiWidthIconLarge"),
-        new("Icon Size", "SemiWidthIconExtraLarge"),
-        new("Border CornerRadius", "SemiBorderRadiusExtraSmall"),
-        new("Border CornerRadius", "SemiBorderRadiusSmall"),
-        new("Border CornerRadius", "SemiBorderRadiusMedium"),
-        new("Border CornerRadius", "SemiBorderRadiusLarge"),
-        new("Border CornerRadius", "SemiBorderRadiusFull"),
-        new("Border Spacing", "SemiBorderSpacing"),
-        new("Border Spacing", "SemiBorderSpacingControl"),
-        new("Border Spacing", "SemiBorderSpacingControlFocus"),
-        new("Border Thickness", "SemiBorderThickness"),
-        new("Border Thickness", "SemiBorderThicknessControl"),
-        new("Border Thickness", "SemiBorderThicknessControlFocus"),
-        new("Spacing", "SemiSpacingNone"),
-        new("Spacing", "SemiSpacingSuperTight"),
-        new("Spacing", "SemiSpacingExtraTight"),
-        new("Spacing", "SemiSpacingTight"),
-        new("Spacing", "SemiSpacingBaseTight"),
-        new("Spacing", "SemiSpacingBase"),
-        new("Spacing", "SemiSpacingBaseLoose"),
-        new("Spacing", "SemiSpacingLoose"),
-        new("Spacing", "SemiSpacingExtraLoose"),
-        new("Spacing", "SemiSpacingSuperLoose"),
-        new("Thickness", "SemiThicknessNone"),
-        new("Thickness", "SemiThicknessSuperTight"),
-        new("Thickness", "SemiThicknessExtraTight"),
-        new("Thickness", "SemiThicknessTight"),
-        new("Thickness", "SemiThicknessBaseTight"),
-        new("Thickness", "SemiThicknessBase"),
-        new("Thickness", "SemiThicknessBaseLoose"),
-        new("Thickness", "SemiThicknessLoose"),
-        new("Thickness", "SemiThicknessExtraLoose"),
-        new("Thickness", "SemiThicknessSuperLoose"),
-        new("FontSize", "SemiFontSizeSmall"),
-        new("FontSize", "SemiFontSizeRegular"),
-        new("FontSize", "SemiFontSizeHeader6"),
-        new("FontSize", "SemiFontSizeHeader5"),
-        new("FontSize", "SemiFontSizeHeader4"),
-        new("FontSize", "SemiFontSizeHeader3"),
-        new("FontSize", "SemiFontSizeHeader2"),
-        new("FontSize", "SemiFontSizeHeader1"),
-        new("FontWeight", "SemiFontWeightLight"),
-        new("FontWeight", "SemiFontWeightRegular"),
-        new("FontWeight", "SemiFontWeightBold"),
-        new("FontFamily", "SemiFontFamilyRegular"),
-    ];
-}
-
-public class VariableItem()
-{
-    public string? Category { get; set; }
-    public string? ResourceKey { get; set; }
-    public Type? Type { get; set; }
-    public string? Value { get; set; }
-    public string? Description { get; set; }
-
-    public VariableItem(string category, string resourceKey, string description = "") : this()
-    {
-        Category = category;
-        ResourceKey = resourceKey;
-        Description = description;
-    }
-
-    public string CopyText =>
-        $"""
-         <StaticResource x:Key="" ResourceKey="{ResourceKey}" />
-         """;
-}

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

@@ -11,23 +11,6 @@
     x:CompileBindings="True"
     x:DataType="views:MainViewModel"
     mc:Ignorable="d">
-    <UserControl.Resources>
-        <ControlTheme x:Key="CategoryTabItem" TargetType="TabItem">
-            <Setter Property="IsEnabled" Value="False" />
-            <Setter Property="Template">
-                <ControlTemplate TargetType="TabItem">
-                    <TextBlock
-                        FontWeight="Bold"
-                        FontSize="12"
-                        Margin="4"
-                        Text="{TemplateBinding Header}" />
-                </ControlTemplate>
-            </Setter>
-            <Style Selector="^:disabled /template/ TextBlock">
-                <Setter Property="Foreground" Value="{DynamicResource SemiColorText1}" />
-            </Style>
-        </ControlTheme>
-    </UserControl.Resources>
     <Grid RowDefinitions="Auto, *">
         <Border
             Grid.Row="0"
@@ -95,196 +78,149 @@
             Grid.Row="1"
             Margin="8"
             Padding="20,0,0,0"
+            HorizontalAlignment="Stretch"
             TabStripPlacement="Left"
             Classes.Dismiss="{Binding #ExpandButton.IsChecked}"
-            Theme="{DynamicResource ScrollLineTabControl}">
+            Theme="{DynamicResource NavigationTab}">
-            <TabControl.Styles>
-                <Style Selector=".Dismiss /template/ ScrollViewer#PART_ScrollViewer">
-                    <Setter Property="IsVisible" Value="False" />
-                </Style>
-            </TabControl.Styles>
-            <TabControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel />
-                </ItemsPanelTemplate>
-            </TabControl.ItemsPanel>
             <TabItem Header="Overview">
                 <pages:Overview />
             </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Resource Browser" />
             <TabItem Header="Palette">
                 <pages:PaletteDemo />
             </TabItem>
             <TabItem Header="HighContrastTheme">
                 <pages:HighContrastDemo />
             </TabItem>
-            <TabItem Header="Variables">
-                <pages:VariablesDemo />
-            </TabItem>
             <TabItem Header="Icon">
                 <pages:IconDemo />
             </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Separate Pack" />
-            <TabItem Header="ColorPicker">
-                <pages:ColorPickerDemo />
-            </TabItem>
-            <TabItem Header="DataGrid">
-                <pages:DataGridDemo />
-            </TabItem>
-            <TabItem Header="TreeDataGrid">
-                <pages:TreeDataGridDemo />
-            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Basic" />
-            <TabItem Header="TextBlock">
-                <pages:TextBlockDemo />
-            </TabItem>
-            <TabItem Header="SelectableTextBlock">
-                <pages:SelectableTextBlockDemo />
-            </TabItem>
-            <TabItem Header="Border">
-                <pages:BorderDemo />
-            </TabItem>
-            <TabItem Header="PathIcon">
-                <pages:PathIconDemo />
-            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Button" />
-            <TabItem Header="Button">
-                <pages:ButtonDemo />
-            </TabItem>
-            <TabItem Header="RepeatButton">
-                <pages:RepeatButtonDemo />
-            </TabItem>
-            <TabItem Header="HyperlinkButton">
-                <pages:HyperlinkButtonDemo />
-            </TabItem>
-            <TabItem Header="ToggleButton">
-                <pages:ToggleButtonDemo />
-            </TabItem>
-            <TabItem Header="CheckBox">
-                <pages:CheckBoxDemo />
-            </TabItem>
-            <TabItem Header="RadioButton">
-                <pages:RadioButtonDemo />
-            </TabItem>
-            <TabItem Header="ToggleSwitch">
-                <pages:ToggleSwitchDemo />
-            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Input" />
-            <TabItem Header="TextBox">
-                <pages:TextBoxDemo />
-            </TabItem>
             <TabItem Header="AutoCompleteBox">
                 <pages:AutoCompleteBoxDemo />
             </TabItem>
-            <TabItem Header="ComboBox">
+            <TabItem Header="Border">
-                <pages:ComboBoxDemo />
+                <pages:BorderDemo />
+            </TabItem>
+            <TabItem Header="Button">
+                <pages:ButtonDemo />
             </TabItem>
             <TabItem Header="ButtonSpinner">
                 <pages:ButtonSpinnerDemo />
             </TabItem>
-            <TabItem Header="NumericUpDown">
-                <pages:NumericUpDownDemo />
-            </TabItem>
-            <TabItem Header="Slider">
-                <pages:SliderDemo />
-            </TabItem>
-            <TabItem Header="ManagedFileChooser">
-                <pages:ManagedFileChooserDemo />
-            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Date/Time" />
             <TabItem Header="Calendar">
                 <pages:CalendarDemo />
             </TabItem>
             <TabItem Header="CalendarDatePicker">
                 <pages:CalendarDatePickerDemo />
             </TabItem>
-            <TabItem Header="DatePicker">
-                <pages:DatePickerDemo />
-            </TabItem>
-            <TabItem Header="TimePicker">
-                <pages:TimePickerDemo />
-            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Navigation" />
-            <TabItem Header="TabControl">
-                <pages:TabControlDemo />
-            </TabItem>
-            <TabItem Header="TabStrip">
-                <pages:TabStripDemo />
-            </TabItem>
-            <TabItem Header="TreeView">
-                <pages:TreeViewDemo />
-            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Show" />
             <TabItem Header="Carousel">
                 <pages:CarouselDemo />
             </TabItem>
+            <TabItem Header="CheckBox">
+                <pages:CheckBoxDemo />
+            </TabItem>
+            <TabItem Header="ColorPicker">
+                <pages:ColorPickerDemo />
+            </TabItem>
+            <TabItem Header="ComboBox">
+                <pages:ComboBoxDemo />
+            </TabItem>
+            <TabItem Header="DataValidationErrors">
+                <pages:DataValidationErrorsDemo />
+            </TabItem>
+            <TabItem Header="DataGrid">
+                <pages:DataGridDemo />
+            </TabItem>
+            <TabItem Header="DatePicker">
+                <pages:DatePickerDemo />
+            </TabItem>
             <TabItem Header="Expander">
                 <pages:ExpanderDemo />
             </TabItem>
             <TabItem Header="Flyout">
                 <pages:FlyoutDemo />
             </TabItem>
+            <TabItem Header="GridSplitter">
+                <pages:GridSplitterDemo />
+            </TabItem>
             <TabItem Header="HeaderedContentControl">
                 <pages:HeaderedContentControlDemo />
             </TabItem>
+            <TabItem Header="HyperlinkButton">
+                <pages:HyperlinkButtonDemo />
+            </TabItem>
             <TabItem Header="Label">
                 <pages:LabelDemo />
             </TabItem>
             <TabItem Header="ListBox">
                 <pages:ListBoxDemo />
             </TabItem>
-            <TabItem Header="SplitView">
+            <TabItem Header="ManagedFileChooser">
-                <pages:SplitViewDemo />
+                <pages:ManagedFileChooserDemo />
-            </TabItem>
-            <TabItem Header="ToolTip">
-                <pages:ToolTipDemo />
-            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Feedback" />
-            <TabItem Header="DataValidationErrors">
-                <pages:DataValidationErrorsDemo />
-            </TabItem>
-            <TabItem Header="Notification">
-                <pages:NotificationDemo />
-            </TabItem>
-            <TabItem Header="ProgressBar">
-                <pages:ProgressBarDemo />
-            </TabItem>
-            <TabItem Header="RefreshContainer">
-                <pages:RefreshContainerDemo />
-            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Other" />
-            <TabItem Header="GridSplitter">
-                <pages:GridSplitterDemo />
             </TabItem>
             <TabItem Header="Menu">
                 <pages:MenuDemo />
             </TabItem>
+            <TabItem Header="Notification">
+                <pages:NotificationDemo />
+            </TabItem>
+            <TabItem Header="NumericUpDown">
+                <pages:NumericUpDownDemo />
+            </TabItem>
+            <TabItem Header="PathIcon">
+                <pages:PathIconDemo />
+            </TabItem>
+            <TabItem Header="ProgressBar">
+                <pages:ProgressBarDemo />
+            </TabItem>
+            <TabItem Header="RadioButton">
+                <pages:RadioButtonDemo />
+            </TabItem>
+            <TabItem Header="RefreshContainer">
+                <pages:RefreshContainerDemo />
+            </TabItem>
+            <TabItem Header="RepeatButton">
+                <pages:RepeatButtonDemo />
+            </TabItem>
             <TabItem Header="ScrollViewer">
                 <pages:ScrollViewerDemo />
             </TabItem>
+            <TabItem Header="SelectableTextBlock">
+                <pages:SelectableTextBlockDemo />
+            </TabItem>
+            <TabItem Header="Slider">
+                <pages:SliderDemo />
+            </TabItem>
+            <TabItem Header="SplitView">
+                <pages:SplitViewDemo />
+            </TabItem>
+            <TabItem Header="TabControl">
+                <pages:TabControlDemo />
+            </TabItem>
+            <TabItem Header="TextBlock">
+                <pages:TextBlockDemo />
+            </TabItem>
+            <TabItem Header="TextBox">
+                <pages:TextBoxDemo />
+            </TabItem>
             <TabItem Header="ThemeVariantScope">
                 <pages:ThemeVariantDemo />
             </TabItem>
+            <TabItem Header="TimePicker">
+                <pages:TimePickerDemo />
+            </TabItem>
+            <TabItem Header="ToggleButton">
+                <pages:ToggleButtonDemo />
+            </TabItem>
+            <TabItem Header="ToggleSwitch">
+                <pages:ToggleSwitchDemo />
+            </TabItem>
+            <TabItem Header="ToolTip">
+                <pages:ToolTipDemo />
+            </TabItem>
+            <TabItem Header="TreeView">
+                <pages:TreeViewDemo />
+            </TabItem>
         </TabControl>
     </Grid>
+
 </UserControl>

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

@@ -114,12 +114,6 @@ public partial class MainViewModel : ObservableObject
                         Command = SelectLocaleCommand,
                         CommandParameter = new CultureInfo("de-de")
                     },
-                    new MenuItemViewModel
-                    {
-                        Header = "Español",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("es-es")
-                    },
                 ]
             }
         ];

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

@@ -0,0 +1,11 @@
+<Application
+    x:Class="Semi.Avalonia.TreeDataGrid.Demo.App"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:semi="https://irihi.tech/semi">
+
+    <Application.Styles>
+        <semi:SemiTheme Locale="zh-CN" />
+        <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
+    </Application.Styles>
+</Application>

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

@@ -0,0 +1,23 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+
+namespace Semi.Avalonia.TreeDataGrid.Demo;
+
+public partial class App : Application
+{
+    public override void Initialize()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+
+    public override void OnFrameworkInitializationCompleted()
+    {
+        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+        {
+            desktop.MainWindow = new MainWindow();
+        }
+
+        base.OnFrameworkInitializationCompleted();
+    }
+}

demo/Semi.Avalonia.TreeDataGrid.Demo/Converters/FileIconConverter.cs

@@ -3,13 +3,15 @@ using System.Collections.Generic;
 using System.Globalization;
 using Avalonia;
 using Avalonia.Data.Converters;
+using Avalonia.Media;
 using Avalonia.Metadata;
 
-namespace Semi.Avalonia.Demo.Converters;
+namespace Semi.Avalonia.TreeDataGrid.Demo.Converters;
 
-public class FileIconConverter : IMultiValueConverter
+public class FileIconConverter: IMultiValueConverter
 {
-    [Content] public IDictionary<string, object?> Items { get; } = new Dictionary<string, object?>();
+    [Content] 
+    public Dictionary<string, PathGeometry> Items { get; set; } = new Dictionary<string, PathGeometry>();
 
     public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
     {
@@ -19,10 +21,8 @@ public class FileIconConverter : IMultiValueConverter
             {
                 return Items["file"];
             }
-
             return isOpen ? Items["folderOpen"] : Items["folderClosed"];
         }
-
         return AvaloniaProperty.UnsetValue;
     }
 }

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

@@ -0,0 +1,138 @@
+<Window
+    x:Class="Semi.Avalonia.TreeDataGrid.Demo.MainWindow"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:Semi.Avalonia.TreeDataGrid.Demo.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:Semi.Avalonia.TreeDataGrid.Demo.ViewModels;assembly=Semi.Avalonia.TreeDataGrid.Demo"
+    Title="Semi.Avalonia.TreeDataGrid.Demo"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    x:DataType="vm:MainViewModel"
+    mc:Ignorable="d">
+    <Window.Resources>
+        <converters:FileIconConverter x:Key="FileIconConverter">
+            <PathGeometry x:Key="file">M14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2M18,20H6V4H13V9H18V20Z</PathGeometry>
+            <PathGeometry x:Key="folderOpen">M6.1,10L4,18V8H21A2,2 0 0,0 19,6H12L10,4H4A2,2 0 0,0 2,6V18A2,2 0 0,0 4,20H19C19.9,20 20.7,19.4 20.9,18.5L23.2,10H6.1M19,18H6L7.6,12H20.6L19,18Z</PathGeometry>
+            <PathGeometry x:Key="folderClosed">M20,18H4V8H20M20,6H12L10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6Z</PathGeometry>
+        </converters:FileIconConverter>
+    </Window.Resources>
+    <Grid RowDefinitions="Auto, *">
+        <Button
+            HorizontalAlignment="Right"
+            Click="Button_OnClick"
+            Content="Theme" />
+        <TabControl Grid.Row="1">
+            <TabItem Header="Songs">
+                <TreeDataGrid
+                    AutoDragDropRows="True"
+                    DataContext="{Binding SongsContext}"
+                    Source="{Binding Songs}">
+                    <TreeDataGrid.Resources>
+                        <DataTemplate x:Key="AlbumCell" DataType="vm:SongViewModel">
+                            <TextBlock
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                Text="{Binding Album}" />
+                        </DataTemplate>
+                        <DataTemplate x:Key="AlbumEditCell" DataType="vm:SongViewModel">
+                            <ComboBox
+                                VerticalAlignment="Center"
+                                Classes="Small"
+                                ItemsSource="{x:Static vm:Song.Albums}"
+                                SelectedItem="{Binding Album}" />
+                        </DataTemplate>
+                        <DataTemplate x:Key="CommentsCell" DataType="vm:SongViewModel">
+                            <TextBlock VerticalAlignment="Center" Text="{Binding CountOfComment}" />
+                        </DataTemplate>
+                        <DataTemplate x:Key="CommentsEditCell" DataType="vm:SongViewModel">
+                            <NumericUpDown
+                                Width="100"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Classes="Small"
+                                Value="{Binding CountOfComment}" />
+                        </DataTemplate>
+                    </TreeDataGrid.Resources>
+                    <TreeDataGrid.Styles>
+                        <Style Selector="TreeDataGrid TreeDataGridRow:nth-last-child(2n)">
+                            <Setter Property="Background" Value="#20808080" />
+                        </Style>
+                    </TreeDataGrid.Styles>
+                </TreeDataGrid>
+            </TabItem>
+            <TabItem Header="Files">
+                <Grid DataContext="{Binding FilesContext}" RowDefinitions="Auto, *">
+                    <DockPanel Margin="0,4" DockPanel.Dock="Top">
+                        <ComboBox
+                            DockPanel.Dock="Left"
+                            ItemsSource="{Binding Drives}"
+                            SelectedItem="{Binding SelectedDrive}" />
+                        <TextBox
+                            Margin="4,0,0,0"
+                            VerticalContentAlignment="Center"
+                            KeyDown="SelectedPath_KeyDown"
+                            Text="{Binding SelectedPath, Mode=OneWay}" />
+                    </DockPanel>
+                    <TreeDataGrid
+                        Name="fileViewer"
+                        Grid.Row="1"
+                        Source="{Binding Source}">
+                        <TreeDataGrid.Resources>
+
+                            <!--  Template for Name column cells  -->
+                            <DataTemplate x:Key="FileNameCell" DataType="vm:FileNodeViewModel">
+                                <StackPanel Orientation="Horizontal">
+                                    <PathIcon
+                                        Width="16"
+                                        Height="16"
+                                        Margin="8,0"
+                                        VerticalAlignment="Center">
+                                        <PathIcon.Data>
+                                            <MultiBinding Converter="{StaticResource FileIconConverter}">
+                                                <Binding Path="IsDirectory" />
+                                                <Binding Path="IsExpanded" />
+                                            </MultiBinding>
+                                        </PathIcon.Data>
+                                    </PathIcon>
+                                    <TextBlock VerticalAlignment="Center" Text="{Binding Name}" />
+                                </StackPanel>
+                            </DataTemplate>
+
+                            <!--  Edit template for Name column cells  -->
+                            <DataTemplate x:Key="FileNameEditCell" DataType="vm:FileNodeViewModel">
+                                <StackPanel Orientation="Horizontal">
+                                    <Image Margin="0,0,4,0" VerticalAlignment="Center">
+                                        <Image.Source>
+                                            <MultiBinding Converter="{StaticResource FileIconConverter}">
+                                                <Binding Path="IsDirectory" />
+                                                <Binding Path="IsExpanded" />
+                                            </MultiBinding>
+                                        </Image.Source>
+                                    </Image>
+                                    <TextBox
+                                        VerticalAlignment="Center"
+                                        Classes="Small"
+                                        Text="{Binding Name}">
+                                        <TextBox.Styles>
+                                            <Style Selector="DataValidationErrors">
+                                                <Setter Property="Theme" Value="{DynamicResource TooltipDataValidationErrors}" />
+                                            </Style>
+                                        </TextBox.Styles>
+                                    </TextBox>
+                                </StackPanel>
+                            </DataTemplate>
+                        </TreeDataGrid.Resources>
+                        <TreeDataGrid.Styles>
+                            <Style Selector="TreeDataGrid TreeDataGridRow:nth-child(2n)">
+                                <Setter Property="Background" Value="#20808080" />
+                            </Style>
+                        </TreeDataGrid.Styles>
+                    </TreeDataGrid>
+                </Grid>
+            </TabItem>
+        </TabControl>
+    </Grid>
+</Window>

demo/Semi.Avalonia.TreeDataGrid.Demo/MainWindow.axaml.cs

@@ -0,0 +1,36 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Styling;
+using Semi.Avalonia.TreeDataGrid.Demo.ViewModels;
+
+namespace Semi.Avalonia.TreeDataGrid.Demo;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+        this.DataContext = new MainViewModel();
+    }
+
+    private void Button_OnClick(object? sender, RoutedEventArgs e)
+    {
+        var app = Application.Current;
+        if (app is not null)
+        {
+            var theme = app.ActualThemeVariant;
+            app.RequestedThemeVariant = theme == ThemeVariant.Dark ? ThemeVariant.Light : ThemeVariant.Dark;
+        }
+    }
+    
+    private void SelectedPath_KeyDown(object? sender, KeyEventArgs e)
+    {
+        if (e.Key == Key.Enter)
+        {
+            var vm = (MainViewModel)DataContext!;
+            vm.FilesContext.SelectedPath = ((TextBox)sender!).Text;
+        }
+    }
+}

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

@@ -0,0 +1,31 @@
+using System;
+using Avalonia;
+using Avalonia.Media;
+
+namespace Semi.Avalonia.TreeDataGrid.Demo;
+
+sealed class Program
+{
+    // Initialization code. Don't use any Avalonia, third-party APIs or any
+    // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
+    // yet and stuff might break.
+    [STAThread]
+    public static void Main(string[] args) => BuildAvaloniaApp()
+        .With(new FontManagerOptions
+        {
+            FontFallbacks =
+            [
+                new FontFallback
+                {
+                    FontFamily = new FontFamily("Microsoft YaHei")
+                }
+            ]
+        })
+        .StartWithClassicDesktopLifetime(args);
+
+    // Avalonia configuration, don't remove; also used by visual designer.
+    public static AppBuilder BuildAvaloniaApp()
+        => AppBuilder.Configure<App>()
+            .UsePlatformDetect()
+            .LogToTrace();
+}

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

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+        <LangVersion>latest</LangVersion>
+        <ApplicationManifest>app.manifest</ApplicationManifest>
+        <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+        <!-- Uncomment below to enable Native AOT compilation-->
+        <!--<PublishAot>true</PublishAot>-->
+        <!--<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>-->
+    </PropertyGroup>
+
+    <Import Project="../Directory.Build.props"/>
+
+    <ItemGroup>
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
+        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+        <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
+            <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
+            <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="$(CommunityToolkitVersion)"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\Semi.Avalonia.TreeDataGrid\Semi.Avalonia.TreeDataGrid.csproj"/>
+        <ProjectReference Include="..\..\src\Semi.Avalonia\Semi.Avalonia.csproj"/>
+    </ItemGroup>
+</Project>

demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/FilesPageViewModel.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -12,40 +11,43 @@ using Avalonia.Controls.Selection;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Semi.Avalonia.Demo.ViewModels;
+namespace Semi.Avalonia.TreeDataGrid.Demo.ViewModels;
 
-public partial class FilesPageViewModel : ObservableObject
+public class FilesPageViewModel: ObservableObject
 {
     public IList<string> Drives { get; }
-    public HierarchicalTreeDataGridSource<FileNodeViewModel> Source { get; }
+    private string _selectedDrive;
-    [ObservableProperty] private string _selectedDrive;
+    private string? _selectedPath;
-    [ObservableProperty] private string? _selectedPath;
+    private FileNodeViewModel? _root;
-    [ObservableProperty] private FileNodeViewModel? _root;
+    public string SelectedDrive
-
-    partial void OnSelectedDriveChanged(string value)
     {
-        Root = new FileNodeViewModel(value, true, true);
+        get => _selectedDrive;
-        if (Source is not null)
+        set
         {
-            Source.Items = [Root];
+            SetProperty(ref _selectedDrive, value);
+            _root = new FileNodeViewModel(_selectedDrive, isDirectory: true, isRoot: true);
+            Source.Items = new[] { _root };
         }
     }
     
-    partial void OnSelectedPathChanged(string? value)
+    public string? SelectedPath
     {
-        SetSelectedPath(value);
+        get => _selectedPath;
+        set => SetSelectedPath(value);
     }
+    
+    public HierarchicalTreeDataGridSource<FileNodeViewModel> Source { get; }
 
     public FilesPageViewModel()
     {
-        Drives = DriveInfo.GetDrives().Select(x => x.Name).ToList();
+        Drives= DriveInfo.GetDrives().Select(x => x.Name).ToList();
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
-            SelectedDrive = @"C:\";
+            _selectedDrive = "C:\\";
         }
         else
         {
-            SelectedDrive = Drives.FirstOrDefault() ?? "/";
+            _selectedDrive = Drives.FirstOrDefault() ?? "/";
         }
 
         Source = new HierarchicalTreeDataGridSource<FileNodeViewModel>(Array.Empty<FileNodeViewModel>())
@@ -56,7 +58,7 @@ public partial class FilesPageViewModel : ObservableObject
                     null,
                     x => x.IsChecked,
                     (o, v) => o.IsChecked = v,
-                    options: new CheckBoxColumnOptions<FileNodeViewModel>
+                    options: new()
                     {
                         CanUserResizeColumn = false,
                     }),
@@ -66,20 +68,20 @@ public partial class FilesPageViewModel : ObservableObject
                         "FileNameCell",
                         "FileNameEditCell",
                         new GridLength(1, GridUnitType.Star),
-                        new TemplateColumnOptions<FileNodeViewModel>
+                        new()
                         {
-                            CompareAscending = FileNodeViewModel.SortAscending(vm => vm.Name),
+                            CompareAscending = FileNodeViewModel.SortAscending(x => x.Name),
-                            CompareDescending = FileNodeViewModel.SortDescending(vm => vm.Name),
+                            CompareDescending = FileNodeViewModel.SortDescending(x => x.Name),
                             IsTextSearchEnabled = true,
-                            TextSearchValueSelector = vm => vm.Name
+                            TextSearchValueSelector = x => x.Name
                         }),
-                    vm => vm.Children,
+                    x => x.Children,
-                    vm => vm.HasChildren,
+                    x => x.HasChildren,
-                    vm => vm.IsExpanded),
+                    x => x.IsExpanded),
                 new TextColumn<FileNodeViewModel, long?>(
                     "Size",
-                    vm => vm.Size,
+                    x => x.Size,
-                    options: new TextColumnOptions<FileNodeViewModel>
+                    options: new()
                     {
                         CompareAscending = FileNodeViewModel.SortAscending(x => x.Size),
                         CompareDescending = FileNodeViewModel.SortDescending(x => x.Size),
@@ -87,7 +89,7 @@ public partial class FilesPageViewModel : ObservableObject
                 new TextColumn<FileNodeViewModel, DateTimeOffset?>(
                     "Modified",
                     x => x.Modified,
-                    options: new TextColumnOptions<FileNodeViewModel>
+                    options: new()
                     {
                         CompareAscending = FileNodeViewModel.SortAscending(x => x.Modified),
                         CompareDescending = FileNodeViewModel.SortDescending(x => x.Modified),
@@ -97,18 +99,18 @@ public partial class FilesPageViewModel : ObservableObject
         Source.RowSelection!.SingleSelect = false;
         Source.RowSelection.SelectionChanged += SelectionChanged;
     }
-
+    
     private void SelectionChanged(object? sender, TreeSelectionModelSelectionChangedEventArgs<FileNodeViewModel> e)
     {
         var selectedPath = Source.RowSelection?.SelectedItem?.Path;
         this.SetProperty(ref _selectedPath, selectedPath, nameof(SelectedPath));
 
         foreach (var i in e.DeselectedItems)
-            Trace.WriteLine($"Deselected '{i?.Path}'");
+            System.Diagnostics.Trace.WriteLine($"Deselected '{i?.Path}'");
         foreach (var i in e.SelectedItems)
-            Trace.WriteLine($"Selected '{i?.Path}'");
+            System.Diagnostics.Trace.WriteLine($"Selected '{i?.Path}'");
     }
-
+    
     private void SetSelectedPath(string? value)
     {
         if (string.IsNullOrEmpty(value))
@@ -162,28 +164,27 @@ public partial class FilesPageViewModel : ObservableObject
             }
         }
 
-        Source.Items = [Root];
         Source.RowSelection!.SelectedIndex = index;
     }
 }
 
-public partial class FileNodeViewModel : ObservableObject, IEditableObject
+public class FileNodeViewModel: ObservableObject, IEditableObject
 {
-    [ObservableProperty] private string _path;
+    private string _path;
-    [ObservableProperty] private string _name;
+    private string _name;
     private string? _undoName;
-    [ObservableProperty] private long? _size;
+    private long? _size;
-    [ObservableProperty] private DateTimeOffset? _modified;
+    private DateTimeOffset? _modified;
     private FileSystemWatcher? _watcher;
     private ObservableCollection<FileNodeViewModel>? _children;
-    [ObservableProperty] private bool _hasChildren = true;
+    private bool _hasChildren = true;
-    [ObservableProperty] private bool _isExpanded;
+    private bool _isExpanded;
 
-    public FileNodeViewModel(string path, bool isDirectory, bool isRoot = false)
+    public FileNodeViewModel( string path, bool isDirectory, bool isRoot = false)
     {
-        Path = path;
+        _path = path;
-        Name = isRoot ? path : System.IO.Path.GetFileName(Path);
+        _name = isRoot ? path : System.IO.Path.GetFileName(Path);
-        IsExpanded = isRoot;
+        _isExpanded = isRoot;
         IsDirectory = isDirectory;
         HasChildren = isDirectory;
 
@@ -195,6 +196,42 @@ public partial class FileNodeViewModel : ObservableObject, IEditableObject
         }
     }
 
+    public string Path 
+    {
+        get => _path;
+        private set => SetProperty(ref _path, value);
+    }
+
+    public string Name 
+    {
+        get => _name;
+        private set => SetProperty(ref _name, value);
+    }
+
+    public long? Size 
+    {
+        get => _size;
+        private set => SetProperty(ref _size, value);
+    }
+
+    public DateTimeOffset? Modified 
+    {
+        get => _modified;
+        private set => SetProperty(ref _modified, value);
+    }
+
+    public bool HasChildren
+    {
+        get => _hasChildren;
+        private set => SetProperty(ref _hasChildren, value);
+    }
+
+    public bool IsExpanded
+    {
+        get => _isExpanded;
+        set => SetProperty(ref _isExpanded, value);
+    }
+
     public bool IsChecked { get; set; }
     public bool IsDirectory { get; }
     public IReadOnlyList<FileNodeViewModel> Children => _children ??= LoadChildren();
@@ -295,7 +332,6 @@ public partial class FileNodeViewModel : ObservableObject, IEditableObject
                             child.Size = info.Length;
                             child.Modified = info.LastWriteTimeUtc;
                         }
-
                         break;
                     }
                 }
@@ -323,7 +359,7 @@ public partial class FileNodeViewModel : ObservableObject, IEditableObject
                 if (_children[i].Path == e.FullPath)
                 {
                     _children.RemoveAt(i);
-                    Debug.WriteLine($"Removed {e.FullPath}");
+                    System.Diagnostics.Debug.WriteLine($"Removed {e.FullPath}");
                     break;
                 }
             }
@@ -358,7 +394,6 @@ internal static class ListExtensions
                 return i;
             i++;
         }
-
         return -1;
     }
 }

demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/MainViewModel.cs

@@ -1,8 +1,8 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Semi.Avalonia.Demo.ViewModels;
+namespace Semi.Avalonia.TreeDataGrid.Demo.ViewModels;
 
-public class TreeDataGridDemoViewModel: ObservableObject
+public class MainViewModel: ObservableObject
 {
     public SongsPageViewModel SongsContext { get; } = new();
     public FilesPageViewModel FilesContext { get; } = new();

demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/SongsPageViewModel.cs

@@ -0,0 +1,184 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Models.TreeDataGrid;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Semi.Avalonia.TreeDataGrid.Demo.ViewModels;
+
+public class SongsPageViewModel: ObservableObject
+{
+    private readonly ObservableCollection<SongViewModel> _songs;
+    
+    public FlatTreeDataGridSource<SongViewModel> Songs { get; }
+
+    public SongsPageViewModel()
+    {
+        _songs = new ObservableCollection<SongViewModel>(Song.Songs.Select(a => new SongViewModel()
+        {
+            Title = a.Title, Artist = a.Artist, Album = a.Album, CountOfComment = a.CountOfComment,
+            IsSelected = false
+        }));
+
+        Songs = new FlatTreeDataGridSource<SongViewModel>(_songs)
+        {
+            Columns =
+            {
+                new CheckBoxColumn<SongViewModel>("IsSelected", a => a.IsSelected,
+                    (model, b) => { model.IsSelected = b; }, new GridLength(108, GridUnitType.Pixel)),
+                new TextColumn<SongViewModel, string>("Title", a => a.Title, (o, a) => o.Title = a,
+                    new GridLength(6, GridUnitType.Star)),
+                new TextColumn<SongViewModel, string>("Artist", a => a.Artist, (o, a) => o.Artist = a,
+                    new GridLength(6, GridUnitType.Star)),
+                new TemplateColumn<SongViewModel>("Album", "AlbumCell", "AlbumEditCell",
+                    new GridLength(6, GridUnitType.Star)),
+                new TemplateColumn<SongViewModel>("Comments", "CommentsCell", "CommentsEditCell",
+                    new GridLength(6, GridUnitType.Star)),
+            }
+        };
+    }
+
+}
+
+
+public class Song
+{
+    public string? Title { get; set; }
+    public string? Artist { get; set; }
+    public TimeSpan? Duration { get; set; }
+    public string? Album { get; set; }
+    public int? CountOfComment { get; set; }
+    public string Url { get; set; }
+
+    public Song(string title, string artist, int m, int s, string album, int countOfComment, int netEaseId)
+    {
+        Title = title;
+        Artist = artist;
+        Duration = new TimeSpan(0, m, s);
+        Album = album;
+        CountOfComment = countOfComment;
+        Url = $"https://music.163.com/song?id={netEaseId}";
+        
+    }
+
+    public static List<string> Albums { get; set; } = new List<string>()
+    {
+        "A.S.I.A",
+        "饕餮人间",
+        "七步咙咚呛",
+        "大惊小怪",
+        "The ONE",
+        "以梦为马 (壮志骄阳版)",
+        "emo了",
+        "一眼万年",
+        "冲刺吧",
+        "爱的赏味期限",
+        "COSMIC ANTHEM / 手紙",
+        "世界晚安",
+        "明年也要好好长大",
+        "320万年前",
+        "W.O.R.L.D.",
+    };
+
+    public static List<Song> Songs { get; set; } = new List<Song>()
+    {
+        new("好肚有肚(feat.李玲玉)", "熊猫堂ProducePandas", 2, 50, "A.S.I.A", 730, 1487039339),
+        new("荒诞秀", "熊猫堂ProducePandas", 3, 15, "A.S.I.A", 639, 1487037601),
+        new("长大", "熊猫堂ProducePandas", 4, 6, "A.S.I.A", 1114, 1487037690),
+        new("招财猫(feat.纪粹希(G-Tracy))", "熊猫堂ProducePandas", 3, 37, "A.S.I.A", 361, 1487039632),
+        new("千转", "熊猫堂ProducePandas", 4, 0, "A.S.I.A", 1115, 1477312398),
+        new("辣辣辣", "熊猫堂ProducePandas", 3, 24, "A.S.I.A", 1873, 1465043716),
+        new("碎碎念", "熊猫堂ProducePandas", 3, 25, "A.S.I.A", 676, 1474142064),
+        new("盘他", "熊猫堂ProducePandas", 2, 16, "A.S.I.A", 365, 1481652786),
+        new("Na Na Na", "熊猫堂ProducePandas", 3, 26, "A.S.I.A", 312, 1469022662),
+        new("Indigo", "熊猫堂ProducePandas", 3, 15, "A.S.I.A", 137, 1487039517),
+        new("饕餮人间", "熊猫堂ProducePandas", 3, 20, "饕餮人间", 1295, 1499584605),
+        new("七步咙咚呛", "熊猫堂ProducePandas", 3, 10, "七步咙咚呛", 175, 1809095152),
+        new("大惊小怪", "熊猫堂ProducePandas", 3, 32, "大惊小怪", 10420, 1847477425),
+        new("工具人", "熊猫堂ProducePandas", 2, 46, "大惊小怪", 1135, 1847476499),
+        new("以梦为马", "熊猫堂ProducePandas", 4, 19, "大惊小怪", 18361, 1836034373),
+        new("以梦为马(Piano Version)", "熊猫堂ProducePandas", 3, 4, "大惊小怪", 570, 1847477423),
+        new("The ONE", "熊猫堂ProducePandas", 2, 58, "The ONE", 1508, 1864329424),
+        new("The ONE(日文版)", "熊猫堂ProducePandas", 2, 57, "The ONE", 385, 1864329429),
+        new("以梦为马 (壮志骄阳版)", "熊猫堂ProducePandas", 4, 19, "以梦为马 (壮志骄阳版)", 161, 1865138896),
+        new("New Horse", "熊猫堂ProducePandas", 2, 30, "emo了", 643, 1887021307),
+        new("不例外", "熊猫堂ProducePandas", 3, 31, "emo了", 1818, 1887022665),
+        new("满意", "熊猫堂ProducePandas", 4, 32, "emo了", 1081, 1882433472),
+        new("就算与全世界为敌也要跟你在一起", "熊猫堂ProducePandas", 3, 32, "emo了", 2119, 1881759960),
+        new("The ONE", "熊猫堂ProducePandas", 2, 58, "emo了", 67, 1887022648),
+        new("口香糖", "熊猫堂ProducePandas", 3, 10, "emo了", 2181, 1885502254),
+        new("Suuuuuuper Mario", "熊猫堂ProducePandas", 3, 32, "emo了", 1010, 1887021318),
+        new("饕餮人间", "熊猫堂ProducePandas", 3, 22, "emo了", 109, 1887021320),
+        new("以梦为马 (壮志骄阳版)", "熊猫堂ProducePandas", 4, 21, "emo了", 34, 1887022666),
+        new("The ONE(日文版)", "熊猫堂ProducePandas", 2, 57, "emo了", 27, 1887022646),
+        new("满意(DJheap九天版)", "熊猫堂ProducePandas", 4, 31, "emo了", 31, 1901605941),
+        new("一眼万年", "熊猫堂ProducePandas", 3, 54, "一眼万年", 20, 1922599361),
+        new("冲刺", "熊猫堂ProducePandas", 3, 49, "冲刺吧", 1006, 1932878194),
+        new("滴答滴", "熊猫堂ProducePandas", 2, 30, "爱的赏味期限", 86, 1957515790),
+        new("热带季风", "熊猫堂ProducePandas", 2, 45, "爱的赏味期限", 212, 1957514964),
+        new("渣", "熊猫堂ProducePandas", 3, 28, "爱的赏味期限", 22, 1957514965),
+        new("独特", "熊猫堂ProducePandas", 3, 33, "爱的赏味期限", 62, 1957514966),
+        new("雨后", "熊猫堂ProducePandas", 4, 15, "爱的赏味期限", 23, 1957514967),
+        new("然后然后", "熊猫堂ProducePandas", 3, 50, "爱的赏味期限", 108, 1957514968),
+        new("丢", "熊猫堂ProducePandas", 3, 26, "爱的赏味期限", 30, 1957515792),
+        new("热带疾风(FACEVOID桃心连哥 Remix)", "熊猫堂ProducePandas", 3, 23, "爱的赏味期限", 55, 1957515793),
+        new("COSMIC ANTHEM -Japanese Ver.-", "熊猫堂ProducePandas", 3, 11, "COSMIC ANTHEM / 手紙", 0, 1977171493),
+        new("手紙 (「長大-You Raise Me Up-」-Japanese Ver.-)", "熊猫堂ProducePandas", 4, 11, "COSMIC ANTHEM / 手紙", 0,
+            1977171494),
+        new("COSMIC ANTHEM -Chinese Ver.-", "熊猫堂ProducePandas", 3, 31, "COSMIC ANTHEM / 手紙", 0, 1977172202),
+        new("世界晚安", "熊猫堂ProducePandas", 2, 59, "世界晚安", 652, 1985063377),
+        new("世界晚安(泰文版)", "熊猫堂ProducePandas", 2, 59, "世界晚安", 134, 1987842504),
+        new("世界晚安(钢琴版)", "熊猫堂ProducePandas", 3, 2, "世界晚安", 76, 1990475933),
+        new("世界晚安(泰文钢琴版)", "熊猫堂ProducePandas", 3, 2, "世界晚安", 29, 1990475934),
+        new("世界晚安(DJ沈念版)", "熊猫堂ProducePandas", 3, 9, "世界晚安", 34, 2014263184),
+        new("世界晚安(钢琴配乐)", "熊猫堂ProducePandas", 2, 59, "世界晚安", 11, 2014263185),
+        new("明年也要好好长大", "熊猫堂ProducePandas", 3, 12, "明年也要好好长大", 0, 2010515162),
+        new("320万年前（DJ沈念版）", "熊猫堂ProducePandas", 3, 21, "320万年前", 8, 2055888636),
+        new("320万年前", "熊猫堂ProducePandas", 3, 7, "W.O.R.L.D.", 329, 2049770469),
+        new("隐德来希", "熊猫堂ProducePandas", 3, 3, "W.O.R.L.D.", 594, 2061317924),
+        new("孔明", "熊猫堂ProducePandas", 3, 59, "W.O.R.L.D.", 91, 2063175274),
+        new("锦鲤卟噜噜", "熊猫堂ProducePandas", 3, 5, "W.O.R.L.D.", 67, 2059208262),
+        new("指鹿为马", "熊猫堂ProducePandas", 3, 12, "W.O.R.L.D.", 74, 2063175272),
+        new("热带季风Remix", "熊猫堂ProducePandas", 3, 22, "W.O.R.L.D.", 23, 2063173319),
+        new("加州梦境", "熊猫堂ProducePandas", 2, 56, "W.O.R.L.D.", 1662, 2063173324),
+        new("渐进自由", "熊猫堂ProducePandas", 4, 19, "W.O.R.L.D.", 124, 2063173321),
+        new("世界所有的烂漫", "熊猫堂ProducePandas", 3, 30, "W.O.R.L.D.", 335, 2053388775),
+    };
+}
+
+public class SongViewModel: ObservableObject
+{
+    private string? _title;
+    private string? _artist;
+    private string? _album;
+    private int? _countOfComment;
+    private bool? _isSelected;
+    public string? Title
+    {
+        get => _title;
+        set => SetProperty(ref _title, value);
+    }
+    public string? Artist
+    {
+        get => _artist;
+        set => SetProperty(ref _artist, value);
+    }
+    public string? Album
+    {
+        get => _album;
+        set => SetProperty(ref _album, value);
+    }
+    public int? CountOfComment
+    {
+        get => _countOfComment;
+        set => SetProperty(ref _countOfComment, value);
+    }
+    public bool? IsSelected
+    {
+        get => _isSelected;
+        set => SetProperty(ref _isSelected, value);
+    }
+    
+}

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

@@ -0,0 +1,18 @@
+<?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 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.TreeDataGrid.Demo.Desktop"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+</assembly>

src/Package.props

@@ -1,9 +1,9 @@
 <Project>
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0;netstandard2.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
-        <Version>11.2.1.7</Version>
+        <Version>11.2.1.3</Version>
         <Authors>IRIHI Technology Co., Ltd.</Authors>
         <Description>Avalonia Theme inspired by Semi Design.</Description>
         <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>

src/Semi.Avalonia.ColorPicker/AssemblyInfo.cs

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

src/Semi.Avalonia.ColorPicker/ColorPickerSemiTheme.axaml

@@ -1,17 +0,0 @@
-<Styles
-    x:Class="Semi.Avalonia.ColorPicker.ColorPickerSemiTheme"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Styles.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceInclude x:Key="Default" Source="Light.axaml" />
-                <ResourceInclude x:Key="Dark" Source="Dark.axaml" />
-            </ResourceDictionary.ThemeDictionaries>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="Controls/_index.axaml" />
-                <ResourceInclude Source="Shared.axaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-</Styles>

src/Semi.Avalonia.ColorPicker/ColorPickerSemiTheme.axaml.cs

@@ -1,7 +0,0 @@
-using Avalonia.Styling;
-
-namespace Semi.Avalonia.ColorPicker;
-
-public class ColorPickerSemiTheme : Styles
-{
-}

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

@@ -1,48 +1,62 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Avalonia.Controls"
     xmlns:converters="using:Avalonia.Controls.Converters"
+    xmlns:primitives="using:Avalonia.Controls.Primitives"
     x:CompileBindings="True">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorView.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+
     <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft" />
     <converters:ToBrushConverter x:Key="ToBrushConverter" />
 
     <ControlTheme x:Key="{x:Type ColorPicker}" TargetType="ColorPicker">
+        <Setter Property="CornerRadius" Value="3" />
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Width" Value="64" />
         <Setter Property="MinWidth" Value="64" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="MinHeight" Value="{DynamicResource ColorPickerMinHeight}" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ColorPickerCornerRadius}" />
         <Setter Property="Content">
             <Template>
                 <Panel>
                     <Border
                         Margin="1,1,0,1"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
                         Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
-                        CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                        CornerRadius="{TemplateBinding CornerRadius,
+                                                       Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
                     <Border
                         Margin="1,1,0,1"
-                        Background="{TemplateBinding HsvColor, Converter={StaticResource ToBrushConverter}}"
+                        HorizontalAlignment="Stretch"
-                        CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                        VerticalAlignment="Stretch"
+                        Background="{TemplateBinding HsvColor,
+                                                     Converter={StaticResource ToBrushConverter}}"
+                        CornerRadius="{TemplateBinding CornerRadius,
+                                                       Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
                 </Panel>
             </Template>
         </Setter>
         <Setter Property="Palette">
-            <FluentColorPalette />
+            <controls:FluentColorPalette />
         </Setter>
         <Setter Property="Template">
             <ControlTemplate TargetType="{x:Type ColorPicker}">
                 <DropDownButton
                     Width="{TemplateBinding Width}"
                     Height="{TemplateBinding Height}"
-                    MinWidth="{TemplateBinding MinWidth}"
+                    HorizontalContentAlignment="Stretch"
-                    MinHeight="{TemplateBinding MinHeight}"
+                    VerticalContentAlignment="Stretch"
-                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                    ClipToBounds="True"
-                    VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                     Content="{TemplateBinding Content}"
                     ContentTemplate="{TemplateBinding ContentTemplate}"
                     CornerRadius="{TemplateBinding CornerRadius}"
-                    ClipToBounds="True"
                     UseLayoutRounding="False">
                     <DropDownButton.Styles>
                         <Style Selector="FlyoutPresenter.nopadding">
@@ -99,10 +113,13 @@
                                     <!--  Spectrum Tab  -->
                                     <TabItem IsVisible="{TemplateBinding IsColorSpectrumVisible}">
                                         <TabItem.Header>
-                                            <PathIcon
+                                            <Border Height="{DynamicResource ColorViewTabStripHeight}">
-                                                Theme="{StaticResource InnerPathIcon}"
+                                                <PathIcon
-                                                Data="{DynamicResource ColorViewSpectrumIconGlyph}"
+                                                    Width="16"
-                                                Foreground="{Binding $parent[TabItem].Foreground}" />
+                                                    Height="16"
+                                                    Data="{DynamicResource ColorViewSpectrumIconGlyph}"
+                                                    Foreground="{Binding $parent[TabItem].Foreground}" />
+                                            </Border>
                                         </TabItem.Header>
                                         <Grid Margin="12" RowDefinitions="*">
                                             <Grid.ColumnDefinitions>
@@ -110,7 +127,7 @@
                                                 <ColumnDefinition Width="*" />
                                                 <ColumnDefinition Width="Auto" MinWidth="32" />
                                             </Grid.ColumnDefinitions>
-                                            <ColorSlider
+                                            <primitives:ColorSlider
                                                 Name="ColorSpectrumThirdComponentSlider"
                                                 Grid.Column="0"
                                                 Margin="0,0,12,0"
@@ -124,8 +141,8 @@
                                                 IsPerceptive="False"
                                                 IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}"
                                                 Orientation="Vertical" />
-                                            <ColorSpectrum
+                                            <primitives:ColorSpectrum
-                                                Name="ColorSpectrum"
+                                                x:Name="ColorSpectrum"
                                                 Grid.Column="1"
                                                 HorizontalAlignment="Stretch"
                                                 VerticalAlignment="Stretch"
@@ -138,7 +155,7 @@
                                                 MinSaturation="{TemplateBinding MinSaturation}"
                                                 MinValue="{TemplateBinding MinValue}"
                                                 Shape="{TemplateBinding ColorSpectrumShape}" />
-                                            <ColorSlider
+                                            <primitives:ColorSlider
                                                 Name="ColorSpectrumAlphaSlider"
                                                 Grid.Column="2"
                                                 Margin="12,0,0,0"
@@ -150,21 +167,24 @@
                                                 HsvColor="{Binding HsvColor, ElementName=ColorSpectrum}"
                                                 IsEnabled="{TemplateBinding IsAlphaEnabled}"
                                                 Orientation="Vertical">
-                                                <ColorSlider.IsVisible>
+                                                <primitives:ColorSlider.IsVisible>
                                                     <MultiBinding Converter="{x:Static BoolConverters.And}">
                                                         <Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
                                                     </MultiBinding>
-                                                </ColorSlider.IsVisible>
+                                                </primitives:ColorSlider.IsVisible>
-                                            </ColorSlider>
+                                            </primitives:ColorSlider>
                                         </Grid>
                                     </TabItem>
                                     <!--  Palette Tab  -->
                                     <TabItem IsVisible="{TemplateBinding IsColorPaletteVisible}">
                                         <TabItem.Header>
-                                            <PathIcon
+                                            <Border Height="{DynamicResource ColorViewTabStripHeight}">
-                                                Theme="{StaticResource InnerPathIcon}"
+                                                <PathIcon
-                                                Data="{DynamicResource ColorViewPaletteIconGlyph}"
+                                                    Width="16"
-                                                Foreground="{Binding $parent[TabItem].Foreground}" />
+                                                    Height="16"
+                                                    Data="{DynamicResource ColorViewPaletteIconGlyph}"
+                                                    Foreground="{Binding $parent[TabItem].Foreground}" />
+                                            </Border>
                                         </TabItem.Header>
                                         <ListBox
                                             Margin="12"
@@ -197,15 +217,18 @@
                                     <!--  Components Tab  -->
                                     <TabItem IsVisible="{TemplateBinding IsColorComponentsVisible}">
                                         <TabItem.Header>
-                                            <PathIcon
+                                            <Border Height="{DynamicResource ColorViewTabStripHeight}">
-                                                Theme="{StaticResource InnerPathIcon}"
+                                                <PathIcon
-                                                Data="{DynamicResource ColorViewComponentsIconGlyph}"
+                                                    Width="16"
-                                                Foreground="{Binding $parent[TabItem].Foreground}" />
+                                                    Height="16"
+                                                    Data="{DynamicResource ColorViewComponentsIconGlyph}"
+                                                    Foreground="{Binding $parent[TabItem].Foreground}" />
+                                            </Border>
                                         </TabItem.Header>
                                         <Grid
                                             Margin="12"
                                             ColumnDefinitions="Auto,*"
-                                            RowDefinitions="Auto,24,*,*,*,*,12"
+                                            RowDefinitions="Auto,24,1*,1*,1*,1*,12"
                                             Tag="{TemplateBinding ColorModel}">
                                             <Grid.Styles>
                                                 <Style Selector="NumericUpDown">
@@ -249,13 +272,13 @@
                                                 Grid.Row="0"
                                                 Grid.Column="0"
                                                 Grid.ColumnSpan="2"
-                                                ColumnDefinitions="*,12,*">
+                                                ColumnDefinitions="1*,12,1*">
                                                 <!--  RadioButtonGroup  -->
                                                 <Border
                                                     Padding="2"
                                                     Background="{DynamicResource ColorViewRadioButtonPointeroverBackground}"
                                                     CornerRadius="3">
-                                                    <Grid ColumnDefinitions="*,*" IsVisible="{TemplateBinding IsColorModelVisible}">
+                                                    <Grid ColumnDefinitions="1*,1*" IsVisible="{TemplateBinding IsColorModelVisible}">
                                                         <RadioButton
                                                             Name="RgbRadioButton"
                                                             Grid.Column="0"
@@ -264,9 +287,9 @@
                                                             Content="RGB"
                                                             CornerRadius="3,0,0,3"
                                                             IsChecked="{TemplateBinding ColorModel,
-                                                            Converter={StaticResource EnumToBoolConverter},
+                                                                                        Converter={StaticResource EnumToBoolConverter},
-                                                            ConverterParameter={x:Static ColorModel.Rgba},
+                                                                                        ConverterParameter={x:Static controls:ColorModel.Rgba},
-                                                            Mode=TwoWay}"
+                                                                                        Mode=TwoWay}"
                                                             Theme="{DynamicResource ColorViewRadioButton}" />
                                                         <RadioButton
                                                             Name="HsvRadioButton"
@@ -276,20 +299,21 @@
                                                             Content="HSV"
                                                             CornerRadius="0,3,3,0"
                                                             IsChecked="{TemplateBinding ColorModel,
-                                                            Converter={StaticResource EnumToBoolConverter},
+                                                                                        Converter={StaticResource EnumToBoolConverter},
-                                                            ConverterParameter={x:Static ColorModel.Hsva},
+                                                                                        ConverterParameter={x:Static controls:ColorModel.Hsva},
-                                                            Mode=TwoWay}"
+                                                                                        Mode=TwoWay}"
                                                             Theme="{DynamicResource ColorViewRadioButton}" />
                                                     </Grid>
                                                 </Border>
                                                 <TextBox
                                                     Name="PART_HexTextBox"
                                                     Grid.Column="2"
+                                                    Height="32"
                                                     HorizontalAlignment="Stretch"
                                                     AutomationProperties.Name="Hexadecimal Color"
                                                     InnerLeftContent="#"
                                                     IsVisible="{TemplateBinding IsHexInputVisible}"
-                                                    MaxLength="8" />
+                                                    MaxLength="9" />
                                             </Grid>
                                             <!--  Color component editing controls  -->
                                             <!--  Component 1 RGB:Red HSV:Hue  -->
@@ -308,14 +332,15 @@
                                                 NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
                                                 ShowButtonSpinner="False"
                                                 Value="{Binding Value, ElementName=Component1Slider}" />
-                                            <ColorSlider
+                                            <primitives:ColorSlider
-                                                Name="Component1Slider"
+                                                x:Name="Component1Slider"
                                                 Grid.Row="2"
                                                 Grid.Column="1"
                                                 HorizontalAlignment="Stretch"
                                                 VerticalAlignment="Center"
                                                 ColorComponent="Component1"
-                                                ColorModel="{TemplateBinding ColorModel,Mode=OneWay}"
+                                                ColorModel="{TemplateBinding ColorModel,
+                                                                             Mode=OneWay}"
                                                 HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                                                 IsRoundingEnabled="True"
                                                 IsSnapToTickEnabled="True"
@@ -338,14 +363,15 @@
                                                 NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
                                                 ShowButtonSpinner="False"
                                                 Value="{Binding Value, ElementName=Component2Slider}" />
-                                            <ColorSlider
+                                            <primitives:ColorSlider
-                                                Name="Component2Slider"
+                                                x:Name="Component2Slider"
                                                 Grid.Row="3"
                                                 Grid.Column="1"
                                                 HorizontalAlignment="Stretch"
                                                 VerticalAlignment="Center"
                                                 ColorComponent="Component2"
-                                                ColorModel="{TemplateBinding ColorModel,Mode=OneWay}"
+                                                ColorModel="{TemplateBinding ColorModel,
+                                                                             Mode=OneWay}"
                                                 HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                                                 IsRoundingEnabled="True"
                                                 IsSnapToTickEnabled="True"
@@ -368,14 +394,15 @@
                                                 NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
                                                 ShowButtonSpinner="False"
                                                 Value="{Binding Value, ElementName=Component3Slider}" />
-                                            <ColorSlider
+                                            <primitives:ColorSlider
-                                                Name="Component3Slider"
+                                                x:Name="Component3Slider"
                                                 Grid.Row="4"
                                                 Grid.Column="1"
                                                 HorizontalAlignment="Stretch"
                                                 VerticalAlignment="Center"
                                                 ColorComponent="Component3"
-                                                ColorModel="{TemplateBinding ColorModel,Mode=OneWay}"
+                                                ColorModel="{TemplateBinding ColorModel,
+                                                                             Mode=OneWay}"
                                                 HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                                                 IsRoundingEnabled="True"
                                                 IsSnapToTickEnabled="True"
@@ -405,33 +432,34 @@
                                                     </MultiBinding>
                                                 </NumericUpDown.IsVisible>
                                             </NumericUpDown>
-                                            <ColorSlider
+                                            <primitives:ColorSlider
-                                                Name="AlphaComponentSlider"
+                                                x:Name="AlphaComponentSlider"
                                                 Grid.Row="5"
                                                 Grid.Column="1"
                                                 HorizontalAlignment="Stretch"
                                                 VerticalAlignment="Center"
                                                 ColorComponent="Alpha"
-                                                ColorModel="{TemplateBinding ColorModel,Mode=OneWay}"
+                                                ColorModel="{TemplateBinding ColorModel,
+                                                                             Mode=OneWay}"
                                                 HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                                                 IsEnabled="{TemplateBinding IsAlphaEnabled}"
                                                 IsRoundingEnabled="True"
                                                 IsSnapToTickEnabled="True"
                                                 Orientation="Horizontal"
                                                 TickFrequency="1">
-                                                <ColorSlider.IsVisible>
+                                                <primitives:ColorSlider.IsVisible>
                                                     <MultiBinding Converter="{x:Static BoolConverters.And}">
                                                         <Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
                                                         <Binding Path="IsComponentSliderVisible" RelativeSource="{RelativeSource TemplatedParent}" />
                                                     </MultiBinding>
-                                                </ColorSlider.IsVisible>
+                                                </primitives:ColorSlider.IsVisible>
-                                            </ColorSlider>
+                                            </primitives:ColorSlider>
                                         </Grid>
                                     </TabItem>
                                 </TabControl>
                                 <!--  Previewer  -->
                                 <!--  Note that top/bottom margins have -5 to remove for drop shadow padding  -->
-                                <ColorPreviewer
+                                <primitives:ColorPreviewer
                                     Grid.Row="1"
                                     Margin="12,-5,12,7"
                                     HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
@@ -443,9 +471,9 @@
                 </DropDownButton>
             </ControlTemplate>
         </Setter>
-
+        
         <Style Selector="^ /template/ DropDownButton">
-            <Setter Property="Padding" Value="0 0 10 0" />
+            <Setter Property="Padding" Value="0 0 10 0"></Setter>
         </Style>
     </ControlTheme>
 
@@ -453,7 +481,7 @@
         x:Key="HexColorPicker"
         BasedOn="{StaticResource {x:Type ColorPicker}}"
         TargetType="ColorPicker">
-        <Setter Property="MinWidth" Value="200" />
+        <Setter Property="Width" Value="200" />
         <Setter Property="Content">
             <Template>
                 <Grid ColumnDefinitions="Auto, *">
@@ -471,7 +499,8 @@
                         Margin="1,1,0,1"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
-                        Background="{TemplateBinding HsvColor,Converter={StaticResource ToBrushConverter}}"
+                        Background="{TemplateBinding HsvColor,
+                                                     Converter={StaticResource ToBrushConverter}}"
                         CornerRadius="{TemplateBinding CornerRadius}" />
                     <TextBlock
                         Grid.Column="1"
@@ -496,12 +525,9 @@
                 <DropDownButton
                     Width="{TemplateBinding Width}"
                     Height="{TemplateBinding Height}"
-                    MinWidth="{TemplateBinding MinWidth}"
+                    HorizontalContentAlignment="Stretch"
-                    MinHeight="{TemplateBinding MinHeight}"
+                    VerticalContentAlignment="Stretch"
-                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                    ClipToBounds="True"
-                    VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                     Content="{TemplateBinding Content}"
                     ContentTemplate="{TemplateBinding ContentTemplate}"
                     CornerRadius="{TemplateBinding CornerRadius}"
@@ -531,8 +557,8 @@
                                     Grid.Row="0"
                                     CornerRadius="8 8 0 0"
                                     ClipToBounds="True">
-                                    <ColorSpectrum
+                                    <primitives:ColorSpectrum
-                                        Name="ColorSpectrum"
+                                        x:Name="ColorSpectrum"
                                         HorizontalAlignment="Stretch"
                                         VerticalAlignment="Stretch"
                                         Components="{TemplateBinding ColorSpectrumComponents}"
@@ -545,7 +571,7 @@
                                         MinValue="{TemplateBinding MinValue}"
                                         Shape="{TemplateBinding ColorSpectrumShape}" />
                                 </Border>
-                                <ColorSlider
+                                <primitives:ColorSlider
                                     Name="ColorSpectrumThirdComponentSlider"
                                     Grid.Row="1"
                                     HorizontalAlignment="Stretch"
@@ -557,8 +583,8 @@
                                     IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}"
                                     Orientation="Horizontal" />
 
-                                <ColorSlider
+                                <primitives:ColorSlider
-                                    Name="ColorSpectrumAlphaSlider"
+                                    x:Name="ColorSpectrumAlphaSlider"
                                     Grid.Row="2"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Center"
@@ -571,7 +597,8 @@
                                     IsRoundingEnabled="True"
                                     IsSnapToTickEnabled="True"
                                     TickFrequency="1"
-                                    Orientation="Horizontal" />
+                                    Orientation="Horizontal">
+                                </primitives:ColorSlider>
                                 <StackPanel
                                     Grid.Row="3"
                                     HorizontalAlignment="Stretch"
@@ -648,7 +675,7 @@
         x:Key="HexSimpleColorPicker"
         BasedOn="{StaticResource SimpleColorPicker}"
         TargetType="ColorPicker">
-        <Setter Property="MinWidth" Value="200" />
+        <Setter Property="Width" Value="200" />
         <Setter Property="Content">
             <Template>
                 <Grid ColumnDefinitions="Auto, *">
@@ -666,7 +693,8 @@
                         Margin="1,1,0,1"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
-                        Background="{TemplateBinding HsvColor,Converter={StaticResource ToBrushConverter}}"
+                        Background="{TemplateBinding HsvColor,
+                                                     Converter={StaticResource ToBrushConverter}}"
                         CornerRadius="{TemplateBinding CornerRadius}" />
                     <TextBlock
                         Grid.Column="1"
@@ -681,4 +709,4 @@
         </Setter>
     </ControlTheme>
 
-</ResourceDictionary>
+</ResourceDictionary>

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

@@ -33,16 +33,17 @@
                                 Name="PART_AccentDecrement2Border"
                                 Grid.Column="0"
                                 Background="{TemplateBinding HsvColor,
-                                Converter={StaticResource AccentColorConverter},
+                                                             Converter={StaticResource AccentColorConverter},
-                                ConverterParameter='-2'}"
+                                                             ConverterParameter='-2'}"
-                                CornerRadius="{TemplateBinding CornerRadius,Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                                CornerRadius="{TemplateBinding CornerRadius,
+                                                               Converter={StaticResource LeftCornerRadiusFilterConverter}}"
                                 Tag="-2" />
                             <Border
                                 Name="PART_AccentDecrement1Border"
                                 Grid.Column="1"
                                 Background="{TemplateBinding HsvColor,
-                                Converter={StaticResource AccentColorConverter},
+                                                             Converter={StaticResource AccentColorConverter},
-                                ConverterParameter='-1'}"
+                                                             ConverterParameter='-1'}"
                                 Tag="-1" />
                         </Grid>
                         <!--  Right accent colors  -->
@@ -62,16 +63,17 @@
                                 Name="PART_AccentIncrement1Border"
                                 Grid.Column="0"
                                 Background="{TemplateBinding HsvColor,
-                                Converter={StaticResource AccentColorConverter},
+                                                             Converter={StaticResource AccentColorConverter},
-                                ConverterParameter='1'}"
+                                                             ConverterParameter='1'}"
                                 Tag="1" />
                             <Border
                                 Name="PART_AccentIncrement2Border"
                                 Grid.Column="1"
                                 Background="{TemplateBinding HsvColor,
-                                Converter={StaticResource AccentColorConverter},
+                                                             Converter={StaticResource AccentColorConverter},
-                                ConverterParameter='2'}"
+                                                             ConverterParameter='2'}"
-                                CornerRadius="{TemplateBinding CornerRadius,Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                                CornerRadius="{TemplateBinding CornerRadius,
+                                                               Converter={StaticResource RightCornerRadiusFilterConverter}}"
                                 Tag="2" />
                         </Grid>
                         <!--  Preview color: Must be last for drop shadow Z-index  -->
@@ -83,13 +85,12 @@
                             BoxShadow="{DynamicResource ColorPreviewerMainBoxShadow}"
                             CornerRadius="{TemplateBinding CornerRadius}">
                             <Panel>
-                                <Border
+                                <Border Background="{DynamicResource ColorControlCheckeredBackgroundBrush}" CornerRadius="{TemplateBinding CornerRadius}" />
-                                    Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
-                                    CornerRadius="{TemplateBinding CornerRadius}" />
                                 <Border
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Stretch"
-                                    Background="{TemplateBinding HsvColor,Converter={StaticResource ToBrushConverter}}"
+                                    Background="{TemplateBinding HsvColor,
+                                                                 Converter={StaticResource ToBrushConverter}}"
                                     CornerRadius="{TemplateBinding CornerRadius}" />
                             </Panel>
                         </Border>
@@ -99,15 +100,15 @@
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         CornerRadius="{TemplateBinding CornerRadius}"
-                        IsVisible="{TemplateBinding IsAccentColorsVisible,Converter={x:Static BoolConverters.Not}}">
+                        IsVisible="{TemplateBinding IsAccentColorsVisible,
+                                                    Converter={x:Static BoolConverters.Not}}">
                         <Panel>
-                            <Border
+                            <Border Background="{DynamicResource ColorControlCheckeredBackgroundBrush}" CornerRadius="{TemplateBinding CornerRadius}" />
-                                Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
-                                CornerRadius="{TemplateBinding CornerRadius}" />
                             <Border
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
-                                Background="{TemplateBinding HsvColor,Converter={StaticResource ToBrushConverter}}"
+                                Background="{TemplateBinding HsvColor,
+                                                             Converter={StaticResource ToBrushConverter}}"
                                 CornerRadius="{TemplateBinding CornerRadius}" />
                         </Panel>
                     </Border>

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

@@ -11,17 +11,19 @@
         <Setter Property="UseLayoutRounding" Value="False" />
         <Setter Property="BorderBrush" Value="{DynamicResource ColorSliderDefaultBorderBrush}" />
         <Setter Property="BorderThickness" Value="{DynamicResource ColorSliderThumbBorderBrush}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ColorSliderThumbCornerRadius}" />
+        <Setter Property="CornerRadius" Value="999" />
         <Setter Property="Template">
-            <ControlTemplate>
+            <Setter.Value>
-                <Border
+                <ControlTemplate>
-                    Margin="1"
+                    <Border
-                    Background="{TemplateBinding Background}"
+                        Margin="1"
-                    BorderBrush="{TemplateBinding BorderBrush}"
+                        Background="{TemplateBinding Background}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
-                    BoxShadow="{DynamicResource ColorSliderBoxShadow}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}" />
+                        BoxShadow="{DynamicResource ColorSliderBoxShadow}"
-            </ControlTemplate>
+                        CornerRadius="{TemplateBinding CornerRadius}" />
+                </ControlTemplate>
+            </Setter.Value>
         </Setter>
     </ControlTheme>
 
@@ -43,16 +45,20 @@
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
                                 Fill="{DynamicResource ColorControlCheckeredBackgroundBrush}"
-                                RadiusX="{TemplateBinding CornerRadius,Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                                RadiusX="{TemplateBinding CornerRadius,
-                                RadiusY="{TemplateBinding CornerRadius,Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+                                                          Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                                RadiusY="{TemplateBinding CornerRadius,
+                                                          Converter={StaticResource BottomRightCornerRadiusConverter}}" />
                             <Rectangle
                                 Width="{Binding #PART_Track.Bounds.Width}"
                                 Height="{Binding #PART_Track.Bounds.Height}"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
                                 Fill="{TemplateBinding Background}"
-                                RadiusX="{TemplateBinding CornerRadius,Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                                RadiusX="{TemplateBinding CornerRadius,
-                                RadiusY="{TemplateBinding CornerRadius,Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+                                                          Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                                RadiusY="{TemplateBinding CornerRadius,
+                                                          Converter={StaticResource BottomRightCornerRadiusConverter}}" />
                             <Track
                                 Name="PART_Track"
                                 Height="12"
@@ -62,7 +68,8 @@
                                 Maximum="{TemplateBinding Maximum}"
                                 Minimum="{TemplateBinding Minimum}"
                                 Orientation="Horizontal"
-                                Value="{TemplateBinding Value,Mode=TwoWay}">
+                                Value="{TemplateBinding Value,
+                                                        Mode=TwoWay}">
                                 <Track.DecreaseButton>
                                     <RepeatButton
                                         Name="PART_DecreaseButton"
@@ -99,8 +106,10 @@
                                 </Track.IncreaseButton>
                                 <Thumb
                                     Name="ColorSliderThumb"
-                                    Width="{TemplateBinding Height}"
+                                    Width="16"
-                                    Height="{TemplateBinding Height}"
+                                    Height="16"
+                                    Margin="0"
+                                    Padding="0"
                                     DataContext="{TemplateBinding Value}"
                                     Theme="{StaticResource ColorSliderThumbTheme}" />
                             </Track>
@@ -127,16 +136,20 @@
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
                                 Fill="{DynamicResource ColorControlCheckeredBackgroundBrush}"
-                                RadiusX="{TemplateBinding CornerRadius,Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                                RadiusX="{TemplateBinding CornerRadius,
-                                RadiusY="{TemplateBinding CornerRadius,Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+                                                          Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                                RadiusY="{TemplateBinding CornerRadius,
+                                                          Converter={StaticResource BottomRightCornerRadiusConverter}}" />
                             <Rectangle
                                 Width="{Binding #PART_Track.Bounds.Width}"
                                 Height="{Binding #PART_Track.Bounds.Height}"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
                                 Fill="{TemplateBinding Background}"
-                                RadiusX="{TemplateBinding CornerRadius,Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                                RadiusX="{TemplateBinding CornerRadius,
-                                RadiusY="{TemplateBinding CornerRadius,Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+                                                          Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                                RadiusY="{TemplateBinding CornerRadius,
+                                                          Converter={StaticResource BottomRightCornerRadiusConverter}}" />
                             <Track
                                 Name="PART_Track"
                                 Width="12"
@@ -146,7 +159,8 @@
                                 Maximum="{TemplateBinding Maximum}"
                                 Minimum="{TemplateBinding Minimum}"
                                 Orientation="Vertical"
-                                Value="{TemplateBinding Value,Mode=TwoWay}">
+                                Value="{TemplateBinding Value,
+                                                        Mode=TwoWay}">
                                 <Track.DecreaseButton>
                                     <RepeatButton
                                         Name="PART_DecreaseButton"
@@ -185,6 +199,8 @@
                                     Name="ColorSliderThumb"
                                     Width="{TemplateBinding Width}"
                                     Height="{TemplateBinding Width}"
+                                    Margin="0"
+                                    Padding="0"
                                     DataContext="{TemplateBinding Value}"
                                     Theme="{StaticResource ColorSliderThumbTheme}" />
                             </Track>
@@ -215,4 +231,4 @@
         </Style>
 
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

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

@@ -1,115 +1,125 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Avalonia.Controls"
     xmlns:converters="using:Avalonia.Controls.Converters"
     x:CompileBindings="True">
     <converters:EnumToBoolConverter x:Key="EnumToBoolConverter" />
     <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadiusConverter" Corner="TopLeft" />
     <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadiusConverter" Corner="BottomRight" />
 
+
     <ControlTheme x:Key="{x:Type ColorSpectrum}" TargetType="ColorSpectrum">
-        <Setter Property="CornerRadius" Value="{DynamicResource ColorSpectrumCornerRadius}" />
+        <Setter Property="CornerRadius" Value="6" />
         <Setter Property="Template">
-            <ControlTemplate TargetType="{x:Type ColorSpectrum}">
+            <Setter.Value>
-                <Panel
+                <ControlTemplate TargetType="{x:Type ColorSpectrum}">
-                    Name="PART_LayoutRoot"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch">
                     <Panel
-                        Name="PART_SizingPanel"
+                        Name="PART_LayoutRoot"
-                        HorizontalAlignment="Center"
+                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Center"
+                        VerticalAlignment="Stretch">
-                        ClipToBounds="True">
+                        <Panel
-                        <Rectangle
+                            Name="PART_SizingPanel"
-                            Name="PART_SpectrumRectangle"
+                            HorizontalAlignment="Center"
-                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center"
-                            VerticalAlignment="Stretch"
+                            ClipToBounds="True">
-                            IsHitTestVisible="False"
+                            <Rectangle
-                            IsVisible="{TemplateBinding Shape,
+                                Name="PART_SpectrumRectangle"
-                            Converter={StaticResource EnumToBoolConverter},
+                                HorizontalAlignment="Stretch"
-                            ConverterParameter={x:Static ColorSpectrumShape.Box}}"
+                                VerticalAlignment="Stretch"
-                            RadiusX="{TemplateBinding CornerRadius,Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                                IsHitTestVisible="False"
-                            RadiusY="{TemplateBinding CornerRadius,Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+                                IsVisible="{TemplateBinding Shape,
-                        <Rectangle
+                                                            Converter={StaticResource EnumToBoolConverter},
-                            Name="PART_SpectrumOverlayRectangle"
+                                                            ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
-                            HorizontalAlignment="Stretch"
+                                RadiusX="{TemplateBinding CornerRadius,
-                            VerticalAlignment="Stretch"
+                                                          Converter={StaticResource TopLeftCornerRadiusConverter}}"
-                            IsHitTestVisible="False"
+                                RadiusY="{TemplateBinding CornerRadius,
-                            IsVisible="{TemplateBinding Shape,
+                                                          Converter={StaticResource BottomRightCornerRadiusConverter}}" />
-                            Converter={StaticResource EnumToBoolConverter},
+                            <Rectangle
-                            ConverterParameter={x:Static ColorSpectrumShape.Box}}"
+                                Name="PART_SpectrumOverlayRectangle"
-                            RadiusX="{TemplateBinding CornerRadius,Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                                HorizontalAlignment="Stretch"
-                            RadiusY="{TemplateBinding CornerRadius,Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+                                VerticalAlignment="Stretch"
-                        <Ellipse
+                                IsHitTestVisible="False"
-                            Name="PART_SpectrumEllipse"
+                                IsVisible="{TemplateBinding Shape,
-                            HorizontalAlignment="Stretch"
+                                                            Converter={StaticResource EnumToBoolConverter},
-                            VerticalAlignment="Stretch"
+                                                            ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
-                            IsHitTestVisible="False"
+                                RadiusX="{TemplateBinding CornerRadius,
-                            IsVisible="{TemplateBinding Shape,
+                                                          Converter={StaticResource TopLeftCornerRadiusConverter}}"
-                            Converter={StaticResource EnumToBoolConverter},
+                                RadiusY="{TemplateBinding CornerRadius,
-                            ConverterParameter={x:Static ColorSpectrumShape.Ring}}" />
+                                                          Converter={StaticResource BottomRightCornerRadiusConverter}}" />
-                        <Ellipse
+                            <Ellipse
-                            Name="PART_SpectrumOverlayEllipse"
+                                Name="PART_SpectrumEllipse"
-                            HorizontalAlignment="Stretch"
+                                HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
-                            IsHitTestVisible="False"
+                                IsHitTestVisible="False"
-                            IsVisible="{TemplateBinding Shape,
+                                IsVisible="{TemplateBinding Shape,
-                            Converter={StaticResource EnumToBoolConverter},
+                                                            Converter={StaticResource EnumToBoolConverter},
-                            ConverterParameter={x:Static ColorSpectrumShape.Ring}}" />
+                                                            ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
-                        <Canvas
+                            <Ellipse
-                            Name="PART_InputTarget"
+                                Name="PART_SpectrumOverlayEllipse"
-                            HorizontalAlignment="Stretch"
+                                HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
-                            Background="Transparent">
+                                IsHitTestVisible="False"
-                            <!--  Note: ToolTip.VerticalOffset is for touch devices to keep the tip above fingers  -->
+                                IsVisible="{TemplateBinding Shape,
-                            <Panel
+                                                            Converter={StaticResource EnumToBoolConverter},
-                                Name="PART_SelectionEllipsePanel"
+                                                            ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
-                                ToolTip.Placement="Top"
+                            <Canvas
-                                ToolTip.VerticalOffset="-10">
+                                Name="PART_InputTarget"
-                                <Ellipse
+                                HorizontalAlignment="Stretch"
-                                    Name="FocusEllipse"
+                                VerticalAlignment="Stretch"
-                                    Margin="-2"
+                                Background="Transparent">
-                                    HorizontalAlignment="Stretch"
+                                <!--  Note: ToolTip.VerticalOffset is for touch devices to keep the tip above fingers  -->
-                                    VerticalAlignment="Stretch"
+                                <Panel
-                                    IsHitTestVisible="False"
+                                    Name="PART_SelectionEllipsePanel"
-                                    StrokeThickness="2" />
+                                    ToolTip.Placement="Top"
-                                <Ellipse
+                                    ToolTip.VerticalOffset="-10">
-                                    Name="SelectionEllipse"
+                                    <Ellipse
-                                    HorizontalAlignment="Stretch"
+                                        Name="FocusEllipse"
-                                    VerticalAlignment="Stretch"
+                                        Margin="-2"
-                                    IsHitTestVisible="False"
+                                        HorizontalAlignment="Stretch"
-                                    StrokeThickness="2" />
+                                        VerticalAlignment="Stretch"
-                                <ToolTip.Tip>
+                                        IsHitTestVisible="False"
-                                    <!--  Set in code-behind  -->
+                                        StrokeThickness="2" />
-                                </ToolTip.Tip>
+                                    <Ellipse
-                            </Panel>
+                                        Name="SelectionEllipse"
-                        </Canvas>
+                                        HorizontalAlignment="Stretch"
-                        <Rectangle
+                                        VerticalAlignment="Stretch"
-                            Name="BorderRectangle"
+                                        IsHitTestVisible="False"
-                            HorizontalAlignment="Stretch"
+                                        StrokeThickness="2" />
-                            VerticalAlignment="Stretch"
+                                    <ToolTip.Tip>
-                            IsHitTestVisible="False"
+                                        <!--  Set in code-behind  -->
-                            IsVisible="{TemplateBinding Shape,
+                                    </ToolTip.Tip>
-                            Converter={StaticResource EnumToBoolConverter},
+                                </Panel>
-                            ConverterParameter={x:Static ColorSpectrumShape.Box}}"
+                            </Canvas>
-                            RadiusX="{TemplateBinding CornerRadius,Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                            <Rectangle
-                            RadiusY="{TemplateBinding CornerRadius,Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+                                Name="BorderRectangle"
-                        <Ellipse
+                                HorizontalAlignment="Stretch"
-                            Name="BorderEllipse"
+                                VerticalAlignment="Stretch"
-                            HorizontalAlignment="Stretch"
+                                IsHitTestVisible="False"
-                            VerticalAlignment="Stretch"
+                                IsVisible="{TemplateBinding Shape,
-                            IsHitTestVisible="False"
+                                                            Converter={StaticResource EnumToBoolConverter},
-                            IsVisible="{TemplateBinding Shape,
+                                                            ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
-                            Converter={StaticResource EnumToBoolConverter},
+                                RadiusX="{TemplateBinding CornerRadius,
-                            ConverterParameter={x:Static ColorSpectrumShape.Ring}}" />
+                                                          Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                                RadiusY="{TemplateBinding CornerRadius,
+                                                          Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+                            <Ellipse
+                                Name="BorderEllipse"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                IsHitTestVisible="False"
+                                IsVisible="{TemplateBinding Shape,
+                                                            Converter={StaticResource EnumToBoolConverter},
+                                                            ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
+                        </Panel>
                     </Panel>
-                </Panel>
+                </ControlTemplate>
-            </ControlTemplate>
+            </Setter.Value>
         </Setter>
 
         <!--  Normal  -->
         <!--  Separating this allows easier customization in applications  -->
-        <Style Selector="^ /template/ Ellipse#BorderEllipse,^ /template/ Rectangle#BorderRectangle">
+        <Style Selector="^ /template/ Ellipse#BorderEllipse,                      ^ /template/ Rectangle#BorderRectangle">
             <Setter Property="Stroke" Value="{DynamicResource ColorSpectrumBorderBrush}" />
             <Setter Property="StrokeThickness" Value="1" />
         </Style>

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

@@ -1,9 +1,11 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Avalonia.Controls"
     xmlns:converters="using:Avalonia.Controls.Converters"
     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">
     <pc:ContrastBrushConverter x:Key="ContrastBrushConverter" />
@@ -17,15 +19,6 @@
     <cvts:ToColorModel x:Key="ToColorModel" />
     <globalization:NumberFormatInfo x:Key="ColorViewComponentNumberFormat" NumberDecimalDigits="0" />
 
-    <Design.PreviewWith>
-        <ColorView
-            Theme="{StaticResource SimpleColorView}"
-            IsAlphaVisible="True"
-            IsAlphaEnabled="True"
-            ColorModel="Hsva"
-            HsvColor="hsv(120,7%,90%)" />
-    </Design.PreviewWith>
-
     <VisualBrush
         x:Key="ColorControlCheckeredBackgroundBrush"
         DestinationRect="0,0,8,8"
@@ -123,12 +116,12 @@
     </ControlTheme>
 
     <ControlTheme x:Key="ColorViewRadioButton" TargetType="RadioButton">
-        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="RadioButton.Cursor" Value="Hand" />
-        <Setter Property="FontWeight" Value="{DynamicResource ColorViewRadioButtonFontWeight}" />
+        <Setter Property="RadioButton.FontWeight" Value="{DynamicResource ColorViewRadioButtonFontWeight}" />
-        <Setter Property="Padding" Value="{DynamicResource ColorViewRadioButtonPadding}" />
+        <Setter Property="RadioButton.Padding" Value="{DynamicResource ColorViewRadioButtonPadding}" />
-        <Setter Property="Foreground" Value="{DynamicResource ColorViewRadioButtonForeground}" />
+        <Setter Property="RadioButton.Foreground" Value="{DynamicResource ColorViewRadioButtonForeground}" />
-        <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonBackground}" />
+        <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonBackground}" />
-        <Setter Property="Template">
+        <Setter Property="RadioButton.Template">
             <ControlTemplate TargetType="RadioButton">
                 <ContentPresenter
                     Name="PART_ContentPresenter"
@@ -170,10 +163,10 @@
 
     <ControlTheme x:Key="{x:Type ColorView}" TargetType="ColorView">
         <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="Width" Value="300" />
+        <Setter Property="ColorView.Width" Value="300" />
-        <Setter Property="Height" Value="300" />
+        <Setter Property="ColorView.Height" Value="300" />
-        <Setter Property="Palette">
+        <Setter Property="ColorView.Palette">
-            <FluentColorPalette />
+            <controls:FluentColorPalette />
         </Setter>
         <Setter Property="Template">
             <ControlTemplate TargetType="{x:Type ColorView}">
@@ -215,10 +208,13 @@
                         <!--  Spectrum Tab  -->
                         <TabItem IsVisible="{TemplateBinding IsColorSpectrumVisible}">
                             <TabItem.Header>
-                                <PathIcon
+                                <Border Height="{DynamicResource ColorViewTabStripHeight}">
-                                    Theme="{StaticResource InnerPathIcon}"
+                                    <PathIcon
-                                    Data="{DynamicResource ColorViewSpectrumIconGlyph}"
+                                        Width="16"
-                                    Foreground="{Binding $parent[TabItem].Foreground}" />
+                                        Height="16"
+                                        Data="{DynamicResource ColorViewSpectrumIconGlyph}"
+                                        Foreground="{Binding $parent[TabItem].Foreground}" />
+                                </Border>
                             </TabItem.Header>
                             <Grid Margin="12" RowDefinitions="*">
                                 <Grid.ColumnDefinitions>
@@ -226,7 +222,7 @@
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="Auto" MinWidth="32" />
                                 </Grid.ColumnDefinitions>
-                                <ColorSlider
+                                <primitives:ColorSlider
                                     Name="ColorSpectrumThirdComponentSlider"
                                     Grid.Column="0"
                                     Margin="0,0,12,0"
@@ -240,8 +236,8 @@
                                     IsPerceptive="False"
                                     IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}"
                                     Orientation="Vertical" />
-                                <ColorSpectrum
+                                <primitives:ColorSpectrum
-                                    Name="ColorSpectrum"
+                                    x:Name="ColorSpectrum"
                                     Grid.Column="1"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Stretch"
@@ -254,8 +250,8 @@
                                     MinSaturation="{TemplateBinding MinSaturation}"
                                     MinValue="{TemplateBinding MinValue}"
                                     Shape="{TemplateBinding ColorSpectrumShape}" />
-                                <ColorSlider
+                                <primitives:ColorSlider
-                                    Name="ColorSpectrumAlphaSlider"
+                                    x:Name="ColorSpectrumAlphaSlider"
                                     Grid.Column="2"
                                     Margin="12,0,0,0"
                                     HorizontalAlignment="Center"
@@ -266,21 +262,24 @@
                                     HsvColor="{Binding HsvColor, ElementName=ColorSpectrum}"
                                     IsEnabled="{TemplateBinding IsAlphaEnabled}"
                                     Orientation="Vertical">
-                                    <ColorSlider.IsVisible>
+                                    <primitives:ColorSlider.IsVisible>
                                         <MultiBinding Converter="{x:Static BoolConverters.And}">
                                             <Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
                                         </MultiBinding>
-                                    </ColorSlider.IsVisible>
+                                    </primitives:ColorSlider.IsVisible>
-                                </ColorSlider>
+                                </primitives:ColorSlider>
                             </Grid>
                         </TabItem>
                         <!--  Palette Tab  -->
                         <TabItem IsVisible="{TemplateBinding IsColorPaletteVisible}">
                             <TabItem.Header>
-                                <PathIcon
+                                <Border Height="{DynamicResource ColorViewTabStripHeight}">
-                                    Theme="{StaticResource InnerPathIcon}"
+                                    <PathIcon
-                                    Data="{DynamicResource ColorViewPaletteIconGlyph}"
+                                        Width="16"
-                                    Foreground="{Binding $parent[TabItem].Foreground}" />
+                                        Height="16"
+                                        Data="{DynamicResource ColorViewPaletteIconGlyph}"
+                                        Foreground="{Binding $parent[TabItem].Foreground}" />
+                                </Border>
                             </TabItem.Header>
                             <ListBox
                                 Margin="12"
@@ -313,15 +312,18 @@
                         <!--  Components Tab  -->
                         <TabItem IsVisible="{TemplateBinding IsColorComponentsVisible}">
                             <TabItem.Header>
-                                <PathIcon
+                                <Border Height="{DynamicResource ColorViewTabStripHeight}">
-                                    Theme="{StaticResource InnerPathIcon}"
+                                    <PathIcon
-                                    Data="{DynamicResource ColorViewComponentsIconGlyph}"
+                                        Width="16"
-                                    Foreground="{Binding $parent[TabItem].Foreground}" />
+                                        Height="16"
+                                        Data="{DynamicResource ColorViewComponentsIconGlyph}"
+                                        Foreground="{Binding $parent[TabItem].Foreground}" />
+                                </Border>
                             </TabItem.Header>
                             <Grid
                                 Margin="12"
                                 ColumnDefinitions="Auto,*"
-                                RowDefinitions="Auto,24,*,*,*,*,12"
+                                RowDefinitions="Auto,24,1*,1*,1*,1*,12"
                                 UseLayoutRounding="False">
                                 <Grid.Styles>
                                     <Style Selector="NumericUpDown">
@@ -337,42 +339,43 @@
                                     Grid.Row="0"
                                     Grid.Column="0"
                                     Grid.ColumnSpan="2"
-                                    ColumnDefinitions="*,12,*">
+                                    ColumnDefinitions="1*,12,1*">
                                     <!--  RadioButtonGroup  -->
                                     <Border
                                         Padding="2"
                                         Background="{DynamicResource ColorViewRadioButtonPointeroverBackground}"
                                         CornerRadius="3">
-                                        <Grid ColumnDefinitions="*,*" IsVisible="{TemplateBinding IsColorModelVisible}">
+                                        <Grid ColumnDefinitions="1*,1*" IsVisible="{TemplateBinding IsColorModelVisible}">
                                             <RadioButton
-                                                Name="RgbRadioButton"
+                                                x:Name="RgbRadioButton"
                                                 Grid.Column="0"
                                                 HorizontalContentAlignment="Center"
                                                 VerticalContentAlignment="Center"
                                                 Content="RGB"
                                                 CornerRadius="3,0,0,3"
                                                 IsChecked="{TemplateBinding ColorModel,
-                                                Converter={StaticResource EnumToBoolConverter},
+                                                                            Converter={StaticResource EnumToBoolConverter},
-                                                ConverterParameter={x:Static ColorModel.Rgba},
+                                                                            ConverterParameter={x:Static controls:ColorModel.Rgba},
-                                                Mode=TwoWay}"
+                                                                            Mode=TwoWay}"
                                                 Theme="{DynamicResource ColorViewRadioButton}" />
                                             <RadioButton
-                                                Name="HsvRadioButton"
+                                                x:Name="HsvRadioButton"
                                                 Grid.Column="1"
                                                 HorizontalContentAlignment="Center"
                                                 VerticalContentAlignment="Center"
                                                 Content="HSV"
                                                 CornerRadius="0,3,3,0"
                                                 IsChecked="{TemplateBinding ColorModel,
-                                                Converter={StaticResource EnumToBoolConverter},
+                                                                            Converter={StaticResource EnumToBoolConverter},
-                                                ConverterParameter={x:Static ColorModel.Hsva},
+                                                                            ConverterParameter={x:Static controls:ColorModel.Hsva},
-                                                Mode=TwoWay}"
+                                                                            Mode=TwoWay}"
                                                 Theme="{DynamicResource ColorViewRadioButton}" />
                                         </Grid>
                                     </Border>
                                     <TextBox
-                                        Name="PART_HexTextBox"
+                                        x:Name="PART_HexTextBox"
                                         Grid.Column="2"
+                                        Height="32"
                                         HorizontalAlignment="Stretch"
                                         AutomationProperties.Name="Hexadecimal Color"
                                         InnerLeftContent="#"
@@ -396,14 +399,15 @@
                                     NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
                                     ShowButtonSpinner="False"
                                     Value="{Binding Value, ElementName=Component1Slider}" />
-                                <ColorSlider
+                                <primitives:ColorSlider
-                                    Name="Component1Slider"
+                                    x:Name="Component1Slider"
                                     Grid.Row="2"
                                     Grid.Column="1"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Center"
                                     ColorComponent="Component1"
-                                    ColorModel="{TemplateBinding ColorModel,Mode=OneWay}"
+                                    ColorModel="{TemplateBinding ColorModel,
+                                                                 Mode=OneWay}"
                                     HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                                     IsRoundingEnabled="True"
                                     IsSnapToTickEnabled="True"
@@ -426,14 +430,15 @@
                                     NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
                                     ShowButtonSpinner="False"
                                     Value="{Binding Value, ElementName=Component2Slider}" />
-                                <ColorSlider
+                                <primitives:ColorSlider
-                                    Name="Component2Slider"
+                                    x:Name="Component2Slider"
                                     Grid.Row="3"
                                     Grid.Column="1"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Center"
                                     ColorComponent="Component2"
-                                    ColorModel="{TemplateBinding ColorModel,Mode=OneWay}"
+                                    ColorModel="{TemplateBinding ColorModel,
+                                                                 Mode=OneWay}"
                                     HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                                     IsRoundingEnabled="True"
                                     IsSnapToTickEnabled="True"
@@ -456,14 +461,15 @@
                                     NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
                                     ShowButtonSpinner="False"
                                     Value="{Binding Value, ElementName=Component3Slider}" />
-                                <ColorSlider
+                                <primitives:ColorSlider
-                                    Name="Component3Slider"
+                                    x:Name="Component3Slider"
                                     Grid.Row="4"
                                     Grid.Column="1"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Center"
                                     ColorComponent="Component3"
-                                    ColorModel="{TemplateBinding ColorModel,Mode=OneWay}"
+                                    ColorModel="{TemplateBinding ColorModel,
+                                                                 Mode=OneWay}"
                                     HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                                     IsRoundingEnabled="True"
                                     IsSnapToTickEnabled="True"
@@ -493,33 +499,34 @@
                                         </MultiBinding>
                                     </NumericUpDown.IsVisible>
                                 </NumericUpDown>
-                                <ColorSlider
+                                <primitives:ColorSlider
-                                    Name="AlphaComponentSlider"
+                                    x:Name="AlphaComponentSlider"
                                     Grid.Row="5"
                                     Grid.Column="1"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Center"
                                     ColorComponent="Alpha"
-                                    ColorModel="{TemplateBinding ColorModel,Mode=OneWay}"
+                                    ColorModel="{TemplateBinding ColorModel,
+                                                                 Mode=OneWay}"
                                     HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                                     IsEnabled="{TemplateBinding IsAlphaEnabled}"
                                     IsRoundingEnabled="True"
                                     IsSnapToTickEnabled="True"
                                     Orientation="Horizontal"
                                     TickFrequency="1">
-                                    <ColorSlider.IsVisible>
+                                    <primitives:ColorSlider.IsVisible>
                                         <MultiBinding Converter="{x:Static BoolConverters.And}">
                                             <Binding Path="IsAlphaVisible" RelativeSource="{RelativeSource TemplatedParent}" />
                                             <Binding Path="IsComponentSliderVisible" RelativeSource="{RelativeSource TemplatedParent}" />
                                         </MultiBinding>
-                                    </ColorSlider.IsVisible>
+                                    </primitives:ColorSlider.IsVisible>
-                                </ColorSlider>
+                                </primitives:ColorSlider>
                             </Grid>
                         </TabItem>
                     </TabControl>
                     <!--  Previewer  -->
                     <!--  Note that top/bottom margins have -5 to remove for drop shadow padding  -->
-                    <ColorPreviewer
+                    <primitives:ColorPreviewer
                         Grid.Row="1"
                         Margin="12,-5,12,7"
                         HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
@@ -576,8 +583,8 @@
                         Grid.Row="0"
                         CornerRadius="8 8 0 0"
                         ClipToBounds="True">
-                        <ColorSpectrum
+                        <primitives:ColorSpectrum
-                            Name="ColorSpectrum"
+                            x:Name="ColorSpectrum"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             Components="{TemplateBinding ColorSpectrumComponents}"
@@ -590,7 +597,7 @@
                             MinValue="{TemplateBinding MinValue}"
                             Shape="{TemplateBinding ColorSpectrumShape}" />
                     </Border>
-                    <ColorSlider
+                    <primitives:ColorSlider
                         Name="ColorSpectrumThirdComponentSlider"
                         Grid.Row="1"
                         HorizontalAlignment="Stretch"
@@ -602,7 +609,7 @@
                         IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}"
                         Orientation="Horizontal" />
 
-                    <ColorSlider
+                    <primitives:ColorSlider
                         x:Name="ColorSpectrumAlphaSlider"
                         Grid.Row="2"
                         HorizontalAlignment="Stretch"
@@ -616,7 +623,8 @@
                         IsRoundingEnabled="True"
                         IsSnapToTickEnabled="True"
                         TickFrequency="1"
-                        Orientation="Horizontal" />
+                        Orientation="Horizontal">
+                    </primitives:ColorSlider>
                     <StackPanel
                         Grid.Row="3"
                         HorizontalAlignment="Stretch"
@@ -685,4 +693,13 @@
             <Setter Property="Width" Value="176" />
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+
+    <Design.PreviewWith>
+        <ColorView
+            Theme="{StaticResource SimpleColorView}"
+            IsAlphaVisible="True"
+            IsAlphaEnabled="True"
+            ColorModel="Hsva"
+            HsvColor="hsv(120,7%,90%)" />
+    </Design.PreviewWith>
+</ResourceDictionary>

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

@@ -1,12 +0,0 @@
-<ResourceDictionary
-    x:CompileBindings="True"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorView.axaml" />
-    </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>

src/Semi.Avalonia.ColorPicker/Dark.axaml

@@ -1,21 +1,21 @@
-<ResourceDictionary
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    xmlns="https://github.com/avaloniaui"
+    <SolidColorBrush x:Key="ColorViewRadioButtonForeground" Color="#54A9FF" />
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    <SolidColorBrush x:Key="ColorViewRadioButtonBackground" Color="#1C1F23" />
-    xmlns:semi="https://irihi.tech/semi">
+    <SolidColorBrush x:Key="ColorViewRadioButtonPointeroverBackground" Opacity="0.16" Color="White" />
-    <StaticResource x:Key="ColorViewRadioButtonForeground" ResourceKey="SemiColorPrimary" />
+    <SolidColorBrush x:Key="ColorViewRadioButtonPressedBackground" Opacity="0.20" Color="White" />
-    <StaticResource x:Key="ColorViewRadioButtonBackground" ResourceKey="SemiColorBackground0" />
+    <SolidColorBrush x:Key="ColorViewRadioButtonCheckedForeground" Color="White" />
-    <StaticResource x:Key="ColorViewRadioButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <SolidColorBrush x:Key="ColorViewRadioButtonCheckedBackground" Color="#54A9FF" />
-    <StaticResource x:Key="ColorViewRadioButtonPressedBackground" ResourceKey="SemiColorFill2" />
+    <SolidColorBrush x:Key="ColorViewRadioButtonCheckedPointeroverBackground" Color="#7FC1FF" />
-    <StaticResource x:Key="ColorViewRadioButtonCheckedForeground" ResourceKey="SemiColorWhite" />
+    <SolidColorBrush x:Key="ColorViewRadioButtonCheckedPressedBackground" Color="#A9D7FF" />
-    <StaticResource x:Key="ColorViewRadioButtonCheckedBackground" ResourceKey="SemiColorPrimary" />
+
-    <StaticResource x:Key="ColorViewRadioButtonCheckedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <SolidColorBrush x:Key="ColorViewTabItemSelectedForeground" Color="#54A9FF" />
-    <StaticResource x:Key="ColorViewRadioButtonCheckedPressedBackground" ResourceKey="SemiColorPrimaryActive" />
+
-    <StaticResource x:Key="ColorViewTabItemSelectedForeground" ResourceKey="SemiColorPrimary" />
+
-    <StaticResource x:Key="ColorSliderDefaultBorderBrush" ResourceKey="SemiColorBlack" />
+    <SolidColorBrush x:Key="ColorSliderDefaultBorderBrush" Color="Black" />
-    <StaticResource x:Key="ColorSliderLightBorderBrush" ResourceKey="SemiColorWhite" />
+    <SolidColorBrush x:Key="ColorSliderLightBorderBrush" Color="White" />
-    <StaticResource x:Key="ColorSliderDarkBorderBrush" ResourceKey="SemiColorBlack" />
+    <SolidColorBrush x:Key="ColorSliderDarkBorderBrush" Color="#E4000000" />
-    <StaticResource x:Key="ColorSpectrumBorderBrush" ResourceKey="SemiColorBorder" />
+
-    <StaticResource x:Key="ColorPreviewerMainBoxShadow" ResourceKey="SemiShadowElevated" />
+    <SolidColorBrush x:Key="ColorSpectrumBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <BoxShadows x:Key="ColorSliderBoxShadow">0 0 2 1 #FFFFFF</BoxShadows>
+
-    <semi:SemiColorDarkPalette x:Key="SemiColorPalette" />
+    <BoxShadows x:Key="ColorPreviewerMainBoxShadow">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
 </ResourceDictionary>

src/Semi.Avalonia.ColorPicker/Index.axaml

@@ -6,7 +6,7 @@
                 <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia.ColorPicker/Dark.axaml" />
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/_index.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Shared.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>

src/Semi.Avalonia.ColorPicker/Light.axaml

@@ -1,21 +1,21 @@
-<ResourceDictionary
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    xmlns="https://github.com/avaloniaui"
+    <SolidColorBrush x:Key="ColorViewRadioButtonForeground" Color="#0077FA" />
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    <SolidColorBrush x:Key="ColorViewRadioButtonBackground" Color="White" />
-    xmlns:semi="https://irihi.tech/semi">
+    <SolidColorBrush x:Key="ColorViewRadioButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <StaticResource x:Key="ColorViewRadioButtonForeground" ResourceKey="SemiColorPrimary" />
+    <SolidColorBrush x:Key="ColorViewRadioButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
-    <StaticResource x:Key="ColorViewRadioButtonBackground" ResourceKey="SemiColorBackground0" />
+    <SolidColorBrush x:Key="ColorViewRadioButtonCheckedForeground" Color="White" />
-    <StaticResource x:Key="ColorViewRadioButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <SolidColorBrush x:Key="ColorViewRadioButtonCheckedBackground" Color="#0077FA" />
-    <StaticResource x:Key="ColorViewRadioButtonPressedBackground" ResourceKey="SemiColorFill2" />
+    <SolidColorBrush x:Key="ColorViewRadioButtonCheckedPointeroverBackground" Color="#0062D6" />
-    <StaticResource x:Key="ColorViewRadioButtonCheckedForeground" ResourceKey="SemiColorWhite" />
+    <SolidColorBrush x:Key="ColorViewRadioButtonCheckedPressedBackground" Color="#004FB3" />
-    <StaticResource x:Key="ColorViewRadioButtonCheckedBackground" ResourceKey="SemiColorPrimary" />
+
-    <StaticResource x:Key="ColorViewRadioButtonCheckedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <SolidColorBrush x:Key="ColorViewTabItemSelectedForeground" Color="#0077FA" />
-    <StaticResource x:Key="ColorViewRadioButtonCheckedPressedBackground" ResourceKey="SemiColorPrimaryActive" />
+
-    <StaticResource x:Key="ColorViewTabItemSelectedForeground" ResourceKey="SemiColorPrimary" />
+
-    <StaticResource x:Key="ColorSliderDefaultBorderBrush" ResourceKey="SemiColorBlack" />
+    <SolidColorBrush x:Key="ColorSliderDefaultBorderBrush" Color="Black" />
-    <StaticResource x:Key="ColorSliderLightBorderBrush" ResourceKey="SemiColorWhite" />
+    <SolidColorBrush x:Key="ColorSliderLightBorderBrush" Color="White" />
-    <StaticResource x:Key="ColorSliderDarkBorderBrush" ResourceKey="SemiColorBlack" />
+    <SolidColorBrush x:Key="ColorSliderDarkBorderBrush" Color="#E4000000" />
-    <StaticResource x:Key="ColorSpectrumBorderBrush" ResourceKey="SemiColorBorder" />
+
-    <StaticResource x:Key="ColorPreviewerMainBoxShadow" ResourceKey="SemiShadowElevated" />
+    <SolidColorBrush x:Key="ColorSpectrumBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <BoxShadows x:Key="ColorSliderBoxShadow">0 0 2 1 #FFFFFF</BoxShadows>
+
-    <semi:SemiColorLightPalette x:Key="SemiColorPalette" />
+    <BoxShadows x:Key="ColorPreviewerMainBoxShadow">0 0 1 #4A000000, 0 4 14 #1A000000</BoxShadows>
 </ResourceDictionary>

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

@@ -4,7 +4,7 @@
 
     <PropertyGroup>
         <Title>Semi.Avalonia.ColorPicker</Title>
-        <PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 11.2.1.7</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 11.2.1.3</PackageReleaseNotes>
     </PropertyGroup>
 
     <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
@@ -12,6 +12,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
         <PackageReference Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
     </ItemGroup>
 

src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs

@@ -80,7 +80,7 @@ public class SemiColorLightPalette: IColorPalette
             Color.FromUInt32(0xFF98CDFD),
             Color.FromUInt32(0xFF65B2FC),
             Color.FromUInt32(0xFF3295FB),
-            Color.FromUInt32(0xFF0064FA),
+            Color.FromUInt32(0xFF0077FA),
             Color.FromUInt32(0xFF0062D6),
             Color.FromUInt32(0xFF004FB3),
             Color.FromUInt32(0xFF003D8F),

src/Semi.Avalonia.ColorPicker/Shared.axaml

@@ -1,28 +1,30 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    <StaticResource x:Key="ColorViewRadioButtonFontWeight" ResourceKey="SemiFontWeightBold" />
+    xmlns:colorPicker="clr-namespace:Semi.Avalonia.ColorPicker">
+    <FontWeight x:Key="ColorViewRadioButtonFontWeight">600</FontWeight>
     <Thickness x:Key="ColorViewRadioButtonPadding">16 4</Thickness>
     <x:Double x:Key="ColorViewNumericUpDownWidth">70</x:Double>
 
-    <StaticResource x:Key="ColorViewSpectrumIconGlyph" ResourceKey="SemiIconEyedropper" />
+    <StreamGeometry x:Key="ColorViewSpectrumIconGlyph">M1.22 20.77a4.24 4.24 0 0 1 .02-5.98l9.33-9.28-.94-.95a1.41 1.41 0 0 1 0-1.99 1.39 1.39 0 0 1 1.97 0l.95.97L14.9 1.2a4.16 4.16 0 0 1 5.89.02 4.24 4.24 0 0 1-.02 5.98l-2.3 2.28 1.02 1.02c.54.55.54 1.44 0 1.99-.55.55-1.43.55-1.97 0l-1.03-1.03-9.37 9.32a4.16 4.16 0 0 1-5.89-.02ZM12.54 7.49l1.97 1.99-9.35 9.3c-.55.55-1.42.55-1.97 0a1.41 1.41 0 0 1 .01-2l9.34-9.29Z</StreamGeometry>
-    <StaticResource x:Key="ColorViewPaletteIconGlyph" ResourceKey="SemiIconColorPalette" />
+    <StreamGeometry x:Key="ColorViewPaletteIconGlyph">M2 4c0-1.1.9-2 2-2h5a2 2 0 0 1 2 2v16a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4Zm6 13.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Zm11.59-8.91L16.4 5.4a2 2 0 0 0-2.82 0L13 6v12l6.59-6.59a2 2 0 0 0 0-2.82ZM22 16a2 2 0 0 0-2-2l-8 8h8a2 2 0 0 0 2-2v-4Z</StreamGeometry>
-    <StaticResource x:Key="ColorViewComponentsIconGlyph" ResourceKey="SemiIconList" />
+    <StreamGeometry x:Key="ColorViewComponentsIconGlyph">M4 6.5a2 2 0 1 0 0-4 2 2 0 0 0 0 4ZM9.5 3a1.5 1.5 0 1 0 0 3h11a1.5 1.5 0 0 0 0-3h-11ZM8 11.5c0-.83.67-1.5 1.5-1.5h11a1.5 1.5 0 0 1 0 3h-11A1.5 1.5 0 0 1 8 11.5Zm0 7c0-.83.67-1.5 1.5-1.5h11a1.5 1.5 0 0 1 0 3h-11A1.5 1.5 0 0 1 8 18.5Zm-2-7a2 2 0 1 1-4 0 2 2 0 0 1 4 0Zm-2 9a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z</StreamGeometry>
+    <!-- <StaticResource x:Key="ColorViewSpectrumIconGlyph" ResourceKey="SemiIconEyedropper" /> -->
+    <!-- <StaticResource x:Key="ColorViewPaletteIconGlyph" ResourceKey="SemiIconColorPalette" /> -->
+    <!-- <StaticResource x:Key="ColorViewComponentsIconGlyph" ResourceKey="SemiIconList" /> -->
 
-    <StaticResource x:Key="ColorSliderWidth" ResourceKey="SemiSpacingBase" />
+    <x:Double x:Key="ColorSliderWidth">16</x:Double>
-    <StaticResource x:Key="ColorSliderCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
+    <CornerRadius x:Key="ColorSliderCornerRadius">6</CornerRadius>
-    <StaticResource x:Key="ColorSliderThumbBorderBrush" ResourceKey="SemiThicknessSuperTight" />
+    <Thickness x:Key="ColorSliderThumbBorderBrush">2</Thickness>
-    <StaticResource x:Key="ColorSliderThumbCornerRadius" ResourceKey="SemiBorderRadiusFull" />
+    <BoxShadows x:Key="ColorSliderBoxShadow">0 0 2 1 #FFFFFF</BoxShadows>
 
     <x:Double x:Key="ColorPreviewerAccentSectionWidth">80</x:Double>
     <x:Double x:Key="ColorPreviewerAccentSectionHeight">20</x:Double>
     <x:Double x:Key="ColorPreviewerHeight">48</x:Double>
-    <StaticResource x:Key="ColorPreviewerCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <CornerRadius x:Key="ColorPreviewerCornerRadius">3</CornerRadius>
 
-    <StaticResource x:Key="ColorSpectrumCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
+    <colorPicker:SemiColorDarkPalette x:Key="SemiColorPalette" />
 
-    <StaticResource x:Key="ColorPickerMinHeight" ResourceKey="SemiHeightControlDefault" />
-    <StaticResource x:Key="ColorPickerCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
     <PlacementMode x:Key="ColorPickerFlyoutPlacement">AnchorAndGravity</PlacementMode>
     <PlacementMode x:Key="SimpleColorPickerFlyoutPlacement">BottomEdgeAlignedLeft</PlacementMode>
 </ResourceDictionary>

src/Semi.Avalonia.DataGrid/AssemblyInfo.cs

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

src/Semi.Avalonia.DataGrid/Dark.axaml

@@ -1,21 +1,29 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="DataGridLineBrush" ResourceKey="SemiColorBorder" />
+    <SolidColorBrush x:Key="DataGridLineBrush" Opacity="0.08" Color="White" />
+
     <SolidColorBrush x:Key="DataGridCellBackground" Color="Transparent" />
-    <StaticResource x:Key="DataGridCellFocusBorderBrush" ResourceKey="SemiColorTertiaryLightActive" />
+    <SolidColorBrush x:Key="DataGridCellFocusBorderBrush" Color="#41464C" />
-    <StaticResource x:Key="DataGridCellCurrentBorderBrush" ResourceKey="SemiColorBorder" />
+    <SolidColorBrush x:Key="DataGridCellCurrentBorderBrush" Opacity="0.08" Color="White" />
-    <StaticResource x:Key="DataGridCellErrorBrush" ResourceKey="SemiColorDangerLight" />
+    <SolidColorBrush x:Key="DataGridCellErrorBrush" Color="#6C090B" />
-    <StaticResource x:Key="DataGridColumnHeaderForeground" ResourceKey="SemiColorText2" />
+
+
+    <SolidColorBrush x:Key="DataGridColumnHeaderForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="DataGridColumnHeaderBackground" Color="Transparent" />
-    <StaticResource x:Key="DataGridColumnHeaderPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderPointeroverBackground" Opacity="0.16" Color="White" />
-    <StaticResource x:Key="DataGridColumnHeaderPressedBackground" ResourceKey="SemiColorFill2" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackground" Opacity="0.20" Color="White" />
+
     <SolidColorBrush x:Key="DataGridRowBackground" Color="Transparent" />
-    <StaticResource x:Key="DataGridRowErrorBackground" ResourceKey="SemiColorDangerLight" />
+
+    <SolidColorBrush x:Key="DataGridRowErrorBackground" Color="#6C090B" />
     <SolidColorBrush x:Key="DataGridDetailsPresenterBackground" Color="Transparent" />
-    <StaticResource x:Key="DataGridRowPointeroverBackground" ResourceKey="SemiColorFill1" />
+
-    <StaticResource x:Key="DataGridRowSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <SolidColorBrush x:Key="DataGridRowPointeroverBackground" Opacity="0.16" Color="White" />
-    <StaticResource x:Key="DataGridRowSelectedPointeroverBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
+    <SolidColorBrush x:Key="DataGridRowSelectedBackground" Opacity="0.2" Color="#FF54A9FF" />
-    <StaticResource x:Key="DataGridRowGroupHeaderExpandIconForeground" ResourceKey="SemiColorText2" />
+    <SolidColorBrush x:Key="DataGridRowSelectedPointeroverBackground" Opacity="0.3" Color="#FF54A9FF" />
-    <StaticResource x:Key="DataGridRowGroupHeaderBackground" ResourceKey="SemiColorFill0" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderExpandIconForeground" Opacity="0.6" Color="#F9F9F9" />
-    <StaticResource x:Key="DataGridRowGroupHeaderCurrentBorderBrush" ResourceKey="SemiColorBorder" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderBackground" Opacity="0.12" Color="White" />
-    <StaticResource x:Key="DataGridDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderCurrentBorderBrush" Opacity="0.08" Color="White" />
+
+    <SolidColorBrush x:Key="DataGridDisabledBackground" Color="#E6E8EA" Opacity="0.04" />
 </ResourceDictionary>

src/Semi.Avalonia.DataGrid/DataGrid.axaml

@@ -126,19 +126,21 @@
                             Name="HeaderBackground"
                             Grid.ColumnSpan="2"
                             Margin="4"
-                            CornerRadius="{DynamicResource DataGridColumnHeaderCornerRadius}" />
+                            CornerRadius="3" />
                         <Grid
-                            ColumnDefinitions="*,Auto"
                             Margin="{TemplateBinding Padding}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                            <ContentPresenter
+                            <Grid.ColumnDefinitions>
-                                Content="{TemplateBinding Content}"
+                                <ColumnDefinition Width="*" />
-                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
                             <PathIcon
                                 Name="SortIcon"
                                 Grid.Column="1"
-                                Theme="{StaticResource InnerPathIcon}"
+                                Width="8"
+                                Height="8"
                                 Margin="0,0,8,0"
                                 Foreground="{TemplateBinding Foreground}" />
                         </Grid>
@@ -291,7 +293,7 @@
                             Grid.ColumnSpan="2"
                             Margin="{DynamicResource DataGridRowMargin}"
                             Background="{DynamicResource DataGridRowBackground}"
-                            CornerRadius="{DynamicResource DataGridRowCornerRadius}" />
+                            CornerRadius="3" />
                         <Rectangle
                             Name="InvalidVisualElement"
                             Grid.ColumnSpan="2"
@@ -356,7 +358,8 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="ToggleButton">
                 <PathIcon
-                    Theme="{StaticResource InnerPathIcon}"
+                    Width="12"
+                    Height="12"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Background="Transparent"
@@ -372,7 +375,7 @@
     <ControlTheme x:Key="{x:Type DataGridRowGroupHeader}" TargetType="DataGridRowGroupHeader">
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderBackground}" />
-        <Setter Property="MinHeight" Value="{DynamicResource DataGridRowGroupHeaderMinHeight}" />
+        <Setter Property="MinHeight" Value="32" />
         <Setter Property="Template">
             <ControlTemplate x:DataType="collections:DataGridCollectionViewGroup" TargetType="DataGridRowGroupHeader">
                 <DataGridFrozenGrid
@@ -397,18 +400,20 @@
                         Grid.Column="3"
                         Margin="12,0,0,0"
                         VerticalAlignment="Center"
-                        Orientation="Horizontal"
+                        Orientation="Horizontal">
-                        Spacing="4">
                         <TextBlock
                             Name="PART_PropertyNameElement"
+                            Margin="4,0,0,0"
                             Foreground="{TemplateBinding Foreground}"
                             IsVisible="{TemplateBinding IsPropertyNameVisible}" />
                         <ContentControl
                             Name="PART_GroupKeyContentControl"
+                            Margin="4,0,0,0"
                             Foreground="{TemplateBinding Foreground}"
                             Content="{Binding Key}" />
                         <TextBlock
                             Name="PART_ItemCountElement"
+                            Margin="4,0,0,0"
                             Foreground="{TemplateBinding Foreground}"
                             IsVisible="{TemplateBinding IsItemCountVisible}" />
                     </StackPanel>
@@ -525,7 +530,6 @@
                             Name="PART_VerticalScrollbar"
                             Grid.Row="1"
                             Grid.Column="2"
-                            AllowAutoHide="{Binding Path=(ScrollViewer.AllowAutoHide), RelativeSource={RelativeSource TemplatedParent}}"
                             Orientation="Vertical" />
 
                         <Grid
@@ -536,7 +540,6 @@
                             <ScrollBar
                                 Name="PART_HorizontalScrollbar"
                                 Grid.Column="1"
-                                AllowAutoHide="{Binding Path=(ScrollViewer.AllowAutoHide), RelativeSource={RelativeSource TemplatedParent}}"
                                 Height="{DynamicResource ScrollBarSize}"
                                 Orientation="Horizontal" />
                         </Grid>
@@ -549,7 +552,7 @@
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             Background="{DynamicResource DataGridDisabledBackground}"
-                            CornerRadius="{DynamicResource DataGridDisabledCornerRadius}"
+                            CornerRadius="2"
                             IsHitTestVisible="False"
                             IsVisible="{Binding !$parent[DataGrid].IsEnabled}" />
                     </Grid>
@@ -569,7 +572,7 @@
             </Style>
         </Style>
 
-        <Style Selector="^.InsetContent">
+        <Style Selector="^[(ScrollViewer.AllowAutoHide)=False]">
             <Style Selector="^ /template/ DataGridRowsPresenter#PART_RowsPresenter">
                 <Setter Property="Grid.RowSpan" Value="1" />
                 <Setter Property="Grid.ColumnSpan" Value="2" />
@@ -579,4 +582,4 @@
             </Style>
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia.DataGrid/DataGridSemiTheme.axaml

@@ -1,17 +0,0 @@
-<Styles
-    x:Class="Semi.Avalonia.DataGrid.DataGridSemiTheme"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Styles.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceInclude x:Key="Default" Source="Light.axaml" />
-                <ResourceInclude x:Key="Dark" Source="Dark.axaml" />
-            </ResourceDictionary.ThemeDictionaries>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="DataGrid.axaml" />
-                <ResourceInclude Source="Shared.axaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-</Styles>

src/Semi.Avalonia.DataGrid/DataGridSemiTheme.axaml.cs

@@ -1,7 +0,0 @@
-using Avalonia.Styling;
-
-namespace Semi.Avalonia.DataGrid;
-
-public class DataGridSemiTheme : Styles
-{
-}

src/Semi.Avalonia.DataGrid/Light.axaml

@@ -1,21 +1,29 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="DataGridLineBrush" ResourceKey="SemiColorBorder" />
+    <SolidColorBrush x:Key="DataGridLineBrush" Opacity="0.08" Color="#1C1F23" />
+
     <SolidColorBrush x:Key="DataGridCellBackground" Color="Transparent" />
-    <StaticResource x:Key="DataGridCellFocusBorderBrush" ResourceKey="SemiColorTertiaryLightActive" />
+    <SolidColorBrush x:Key="DataGridCellFocusBorderBrush" Color="#C6CACD" />
-    <StaticResource x:Key="DataGridCellCurrentBorderBrush" ResourceKey="SemiColorBorder" />
+    <SolidColorBrush x:Key="DataGridCellCurrentBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <StaticResource x:Key="DataGridCellErrorBrush" ResourceKey="SemiColorDangerLight" />
+    <SolidColorBrush x:Key="DataGridCellErrorBrush" Color="#FEF2ED" />
-    <StaticResource x:Key="DataGridColumnHeaderForeground" ResourceKey="SemiColorText2" />
+
+
+    <SolidColorBrush x:Key="DataGridColumnHeaderForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="DataGridColumnHeaderBackground" Color="Transparent" />
-    <StaticResource x:Key="DataGridColumnHeaderPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <StaticResource x:Key="DataGridColumnHeaderPressedBackground" ResourceKey="SemiColorFill2" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackground" Opacity="0.13" Color="#2E3238" />
+
     <SolidColorBrush x:Key="DataGridRowBackground" Color="Transparent" />
-    <StaticResource x:Key="DataGridRowErrorBackground" ResourceKey="SemiColorDangerLight" />
+
+    <SolidColorBrush x:Key="DataGridRowErrorBackground" Color="#FEF2ED" />
     <SolidColorBrush x:Key="DataGridDetailsPresenterBackground" Color="Transparent" />
-    <StaticResource x:Key="DataGridRowPointeroverBackground" ResourceKey="SemiColorFill1" />
+
-    <StaticResource x:Key="DataGridRowSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <SolidColorBrush x:Key="DataGridRowPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <StaticResource x:Key="DataGridRowSelectedPointeroverBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
+    <SolidColorBrush x:Key="DataGridRowSelectedBackground" Color="#EAF5FF" />
-    <StaticResource x:Key="DataGridRowGroupHeaderExpandIconForeground" ResourceKey="SemiColorText2" />
+    <SolidColorBrush x:Key="DataGridRowSelectedPointeroverBackground" Color="#CBE7FE" />
-    <StaticResource x:Key="DataGridRowGroupHeaderBackground" ResourceKey="SemiColorFill0" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderExpandIconForeground" Opacity="0.62" Color="#1C1F23" />
-    <StaticResource x:Key="DataGridRowGroupHeaderCurrentBorderBrush" ResourceKey="SemiColorBorder" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderBackground" Opacity="0.05" Color="#2E3238" />
-    <StaticResource x:Key="DataGridDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderCurrentBorderBrush" Opacity="0.08" Color="#1C1F23" />
+
+    <SolidColorBrush x:Key="DataGridDisabledBackground" Color="#2E3238" Opacity="0.02" />
 </ResourceDictionary>

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

@@ -1,18 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+    <Import Project="../Package.props"/>
+
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
-        <Nullable>enable</Nullable>
-        <LangVersion>latest</LangVersion>
-        <Version>11.2.1.7</Version>
-        <PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 11.2.1.7</PackageReleaseNotes>
-        <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>
         <Title>Semi.Avalonia.DataGrid</Title>
+        <PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 11.2.1.3</PackageReleaseNotes>
     </PropertyGroup>
 
     <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
@@ -20,8 +12,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.1"/>
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
-        <None Include="irihi.png" Pack="true" PackagePath=""/>
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)"/>
     </ItemGroup>
 
 </Project>

src/Semi.Avalonia.DataGrid/Shared.axaml

@@ -1,22 +1,23 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Thickness x:Key="DataGridCellTextBlockDefaultMargin">12 0</Thickness>
-    <StaticResource x:Key="DataGridCellMinHeight" ResourceKey="SemiHeightControlDefault" />
+
-    <StaticResource x:Key="DataGridCellVisualBorderThickness" ResourceKey="SemiBorderThicknessControl" />
+    <x:Double x:Key="DataGridCellMinHeight">32</x:Double>
-    <StaticResource x:Key="DataGridCellVisualStrokeThickness" ResourceKey="SemiBorderSpacingControl" />
+    <Thickness x:Key="DataGridCellVisualBorderThickness">1</Thickness>
+    <x:Double x:Key="DataGridCellVisualStrokeThickness">1</x:Double>
 
     <Thickness x:Key="DataGridColumnHeaderPadding">12 0 0 0</Thickness>
-    <StaticResource x:Key="DataGridColumnHeaderMinHeight" ResourceKey="SemiHeightControlDefault" />
+    <x:Double x:Key="DataGridColumnHeaderMinHeight">32</x:Double>
-    <StaticResource x:Key="DataGridColumnHeaderCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+
-    <StaticResource x:Key="DataGridColumnHeaderAscendingGlyph" ResourceKey="SemiIconSmallTriangleTop" />
+    <StreamGeometry x:Key="DataGridColumnHeaderAscendingGlyph">m6.45 8.34 4.8-5.48a1 1 0 0 1 1.5 0l4.8 5.48A1 1 0 0 1 16.8 10H7.2a1 1 0 0 1-.75-1.66Z</StreamGeometry>
-    <StaticResource x:Key="DataGridColumnHeaderDescendingGlyph" ResourceKey="SemiIconSmallTriangleDown" />
+    <StreamGeometry x:Key="DataGridColumnHeaderDescendingGlyph">m17.55 15.66-4.8 5.48a1 1 0 0 1-1.5 0l-4.8-5.48A1 1 0 0 1 7.2 14h9.6a1 1 0 0 1 .75 1.66Z</StreamGeometry>
+    <!-- <StaticResource x:Key="DataGridColumnHeaderAscendingGlyph" ResourceKey="SemiIconCaretUp" /> -->
+    <!-- <StaticResource x:Key="DataGridColumnHeaderDescendingGlyph" ResourceKey="SemiIconCaretDown" /> -->
 
     <Thickness x:Key="DataGridRowHeaderMargin">8 0</Thickness>
-    <StaticResource x:Key="DataGridRowCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <Thickness x:Key="DataGridRowMargin">2</Thickness>
-    <StaticResource x:Key="DataGridRowMargin" ResourceKey="SemiThicknessSuperTight" />
 
-    <StaticResource x:Key="DataGridRowGroupHeaderMinHeight" ResourceKey="SemiHeightControlDefault" />
+    <StreamGeometry x:Key="DataGridRowGroupHeaderExpandIconGlyph">M7.44 19.8a1.5 1.5 0 0 1 0-2.13l5.66-5.65-5.66-5.66a1.5 1.5 0 1 1 2.12-2.12l6.72 6.72a1.5 1.5 0 0 1 0 2.12L9.56 19.8a1.5 1.5 0 0 1-2.12 0Z</StreamGeometry>
-    <StaticResource x:Key="DataGridRowGroupHeaderExpandIconGlyph" ResourceKey="SemiIconChevronRight" />
+    <!-- <StaticResource x:Key="DataGridRowGroupHeaderExpandIconGlyph" ResourceKey="SemiIconChevronRight" /> -->
-    <StaticResource x:Key="DataGridRowGroupHeaderVisualStrokeThickness" ResourceKey="SemiBorderSpacingControl" />
 
-    <StaticResource x:Key="DataGridDisabledCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <x:Double x:Key="DataGridRowGroupHeaderVisualStrokeThickness">1</x:Double>
 </ResourceDictionary>

src/Semi.Avalonia.TreeDataGrid/AssemblyInfo.cs

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

src/Semi.Avalonia.TreeDataGrid/Dark.axaml

@@ -1,11 +1,11 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="TreeDataGridGridLinesBrush" ResourceKey="SemiColorBorder" />
+    <SolidColorBrush x:Key="TreeDataGridGridLinesBrush" Opacity="0.08" Color="White" />
-    <StaticResource x:Key="TreeDataGridHeaderPointerOverBackground" ResourceKey="SemiColorFill1" />
+    <SolidColorBrush x:Key="TreeDataGridHeaderPointerOverBackground" Opacity="0.16" Color="White" />
-    <StaticResource x:Key="TreeDataGridHeaderPressedBackground" ResourceKey="SemiColorFill2" />
+    <SolidColorBrush x:Key="TreeDataGridHeaderPressedBackground" Opacity="0.20" Color="White" />
     <SolidColorBrush x:Key="TreeDataGridHeaderPointerOverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="TreeDataGridHeaderPressedBorderBrush" Color="Transparent" />
-    <StaticResource x:Key="TreeDataGridHeaderPointerOverForeground" ResourceKey="SemiColorText1" />
+    <SolidColorBrush x:Key="TreeDataGridHeaderPointerOverForeground" Opacity="0.8" Color="#F9F9F9" />
-    <StaticResource x:Key="TreeDataGridHeaderPressedForeground" ResourceKey="SemiColorText0" />
+    <SolidColorBrush x:Key="TreeDataGridHeaderPressedForeground" Opacity="1" Color="#F9F9F9" />
-    <StaticResource x:Key="TreeDataGridCellSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <SolidColorBrush x:Key="TreeDataGridCellSelectedBackground" Opacity="0.2" Color="#FF54A9FF" />
-    <StaticResource x:Key="TreeDataGridColumnHeaderForeground" ResourceKey="SemiColorText2" />
+    <SolidColorBrush x:Key="TreeDataGridColumnHeaderForeground" Opacity="0.6" Color="#F9F9F9" />
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia.TreeDataGrid/Light.axaml

@@ -1,11 +1,11 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="TreeDataGridGridLinesBrush" ResourceKey="SemiColorBorder" />
+    <SolidColorBrush x:Key="TreeDataGridGridLinesBrush" Opacity="0.08" Color="#1C1F23" />
-    <StaticResource x:Key="TreeDataGridHeaderPointerOverBackground" ResourceKey="SemiColorFill1" />
+    <SolidColorBrush x:Key="TreeDataGridHeaderPointerOverBackground" Opacity="0.09" Color="#2E3238" />
-    <StaticResource x:Key="TreeDataGridHeaderPressedBackground" ResourceKey="SemiColorFill2" />
+    <SolidColorBrush x:Key="TreeDataGridHeaderPressedBackground" Opacity="0.13" Color="#2E3238" />
     <SolidColorBrush x:Key="TreeDataGridHeaderPointerOverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="TreeDataGridHeaderPressedBorderBrush" Color="Transparent" />
-    <StaticResource x:Key="TreeDataGridHeaderPointerOverForeground" ResourceKey="SemiColorText1" />
+    <SolidColorBrush x:Key="TreeDataGridHeaderPointerOverForeground" Opacity="0.8" Color="#1C1F23" />
-    <StaticResource x:Key="TreeDataGridHeaderPressedForeground" ResourceKey="SemiColorText0" />
+    <SolidColorBrush x:Key="TreeDataGridHeaderPressedForeground" Opacity="1" Color="#1C1F23" />
-    <StaticResource x:Key="TreeDataGridCellSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <SolidColorBrush x:Key="TreeDataGridCellSelectedBackground" Color="#EAF5FF" />
-    <StaticResource x:Key="TreeDataGridColumnHeaderForeground" ResourceKey="SemiColorText2" />
+    <SolidColorBrush x:Key="TreeDataGridColumnHeaderForeground" Opacity="0.62" Color="#1C1F23" />
-</ResourceDictionary>
+</ResourceDictionary>

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

@@ -4,8 +4,8 @@
         <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
-        <Version>11.0.10.3</Version>
+        <Version>11.0.10.1</Version>
-        <PackageReleaseNotes>Update to 11.0.10.3</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to 11.0.10.1</PackageReleaseNotes>
         <Authors>IRIHI Technology Co., Ltd.</Authors>
         <Description>Avalonia Theme inspired by Semi Design.</Description>
         <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>

src/Semi.Avalonia.TreeDataGrid/Shared.axaml

@@ -1,11 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="TreeDataGridSortIconAscendingPath" ResourceKey="SemiIconSmallTriangleTop" />
+    <StreamGeometry x:Key="TreeDataGridSortIconAscendingPath">m6.45 8.34 4.8-5.48a1 1 0 0 1 1.5 0l4.8 5.48A1 1 0 0 1 16.8 10H7.2a1 1 0 0 1-.75-1.66Z</StreamGeometry>
-    <StaticResource x:Key="TreeDataGridSortIconDescendingPath" ResourceKey="SemiIconSmallTriangleDown" />
+    <StreamGeometry x:Key="TreeDataGridSortIconDescendingPath">m17.55 15.66-4.8 5.48a1 1 0 0 1-1.5 0l-4.8-5.48A1 1 0 0 1 7.2 14h9.6a1 1 0 0 1 .75 1.66Z</StreamGeometry>
-    <StaticResource x:Key="TreeDataGridItemCollapsedChevronPathData" ResourceKey="SemiIconTreeTriangleRight" />
+    <StreamGeometry x:Key="TreeDataGridItemCollapsedChevronPathData">m9.66 3.44 8.97 7.8a1 1 0 0 1 0 1.51l-8.97 7.81A1 1 0 0 1 8 19.81V4.19a1 1 0 0 1 1.66-.75Z</StreamGeometry>
-    <StaticResource x:Key="TreeDataGridItemCollapsedChevronWidth" ResourceKey="SemiWidthIconMedium" />
+    <!-- <StaticResource x:Key="TreeDataGridSortIconAscendingPath" ResourceKey="SemiIconCaretUp"/> -->
-    <StaticResource x:Key="TreeDataGridColumnHeaderCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <!-- <StaticResource x:Key="TreeDataGridSortIconDescendingPath" ResourceKey="SemiIconCaretDown"/> -->
-    <StaticResource x:Key="TreeDataGridColumnHeaderMinHeight" ResourceKey="SemiHeightControlDefault" />
+    <!-- <StaticResource x:Key="TreeDataGridItemCollapsedChevronPathData" ResourceKey="SemiIconTreeTriangleRight"/> -->
-    <StaticResource x:Key="TreeDataGridRowCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <Thickness x:Key="TreeDataGridRowMargin">2</Thickness>
-    <StaticResource x:Key="TreeDataGridRowMinHeight" ResourceKey="SemiHeightControlDefault" />
-    <StaticResource x:Key="TreeDataGridRowMargin" ResourceKey="SemiThicknessSuperTight" />
 </ResourceDictionary>

src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml

@@ -49,10 +49,10 @@
 
     <ControlTheme x:Key="{x:Type TreeDataGridColumnHeader}" TargetType="TreeDataGridColumnHeader">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="MinHeight" Value="{DynamicResource TreeDataGridColumnHeaderMinHeight}" />
+        <Setter Property="MinHeight" Value="32" />
         <Setter Property="Padding" Value="8 2 0 2" />
         <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="CornerRadius" Value="{DynamicResource TreeDataGridColumnHeaderCornerRadius}" />
+        <Setter Property="CornerRadius" Value="4" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Foreground" Value="{DynamicResource TreeDataGridColumnHeaderForeground}" />
         <Setter Property="Template">
@@ -87,8 +87,11 @@
                         </Panel>
                         <PathIcon
                             Name="SortIcon"
-                            Theme="{StaticResource InnerPathIcon}"
+                            Width="8"
+                            Height="8"
                             Margin="0,0,8,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
                             DockPanel.Dock="Right"
                             Foreground="{TemplateBinding Foreground}"
                             TabIndex="1" />
@@ -137,8 +140,8 @@
 
     <ControlTheme x:Key="{x:Type TreeDataGridRow}" TargetType="TreeDataGridRow">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="CornerRadius" Value="{DynamicResource TreeDataGridRowCornerRadius}" />
+        <Setter Property="CornerRadius" Value="3" />
-        <Setter Property="MinHeight" Value="{DynamicResource TreeDataGridRowMinHeight}" />
+        <Setter Property="MinHeight" Value="32" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Template">
             <ControlTemplate>
@@ -189,17 +192,25 @@
     </ControlTheme>
 
     <ControlTheme x:Key="TreeDataGridExpandCollapseChevron" TargetType="ToggleButton">
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Width" Value="8" />
+        <Setter Property="Height" Value="8" />
         <Setter Property="Foreground" Value="{DynamicResource TreeDataGridColumnHeaderForeground}" />
         <Setter Property="Template">
             <ControlTemplate>
-                <PathIcon
+                <Border
-                    Name="ChevronPath"
                     Width="{TemplateBinding Width}"
                     Height="{TemplateBinding Height}"
-                    Theme="{StaticResource InnerPathIcon}"
+                    HorizontalAlignment="Center"
-                    Classes="Small"
+                    VerticalAlignment="Center"
-                    Data="{DynamicResource TreeDataGridItemCollapsedChevronPathData}"
+                    Background="Transparent">
-                    Foreground="{TemplateBinding Foreground}" />
+                    <PathIcon
+                        Name="ChevronPath"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Data="{DynamicResource TreeDataGridItemCollapsedChevronPathData}"
+                        Foreground="{TemplateBinding Foreground}" />
+                </Border>
             </ControlTemplate>
         </Setter>
         <Style Selector="^:checked /template/ PathIcon#ChevronPath">
@@ -212,16 +223,18 @@
             <ControlTemplate>
                 <Border
                     Name="CellBorder"
-                    Padding="{TemplateBinding Indent,Converter={x:Static conv:IndentConverter.Instance}}"
+                    Padding="{TemplateBinding Indent,
+                                              Converter={x:Static conv:IndentConverter.Instance}}"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}">
                     <DockPanel>
                         <Border
-                            DockPanel.Dock="Left"
+                            Width="12"
-                            Width="{DynamicResource TreeDataGridItemCollapsedChevronWidth}"
+                            Height="12"
-                            Margin="4,0">
+                            Margin="4,0"
+                            DockPanel.Dock="Left">
                             <ToggleButton
                                 Focusable="False"
                                 IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}"
@@ -322,4 +335,4 @@
             </Setter>
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia.TreeDataGrid/TreeDataGridSemiTheme.axaml

@@ -1,17 +0,0 @@
-<Styles
-    x:Class="Semi.Avalonia.TreeDataGrid.TreeDataGridSemiTheme"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Styles.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceInclude x:Key="Default" Source="Light.axaml" />
-                <ResourceInclude x:Key="Dark" Source="Dark.axaml" />
-            </ResourceDictionary.ThemeDictionaries>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="TreeDataGrid.axaml" />
-                <ResourceInclude Source="Shared.axaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-</Styles>

src/Semi.Avalonia.TreeDataGrid/TreeDataGridSemiTheme.axaml.cs

@@ -1,7 +0,0 @@
-using Avalonia.Styling;
-
-namespace Semi.Avalonia.TreeDataGrid;
-
-public class TreeDataGridSemiTheme : Styles
-{
-}

src/Semi.Avalonia/Controls/AdornerLayer.axaml

@@ -1,7 +1,7 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:CompileBindings="True">
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type AdornerLayer}" TargetType="AdornerLayer">
         <Setter Property="DefaultFocusAdorner">
             <FocusAdornerTemplate>

src/Semi.Avalonia/Controls/AutoCompleteBox.axaml

@@ -79,12 +79,12 @@
                                 BorderThickness="{DynamicResource AutoCompleteBoxPopupBorderThickness}"
                                 BoxShadow="{DynamicResource AutoCompleteBoxPopupBoxShadow}"
                                 CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}">
-                                <ListBox
+                                    <ListBox
-                                    Name="PART_SelectingItemsControl"
+                                        Name="PART_SelectingItemsControl"
-                                    Foreground="{TemplateBinding Foreground}"
+                                        Foreground="{TemplateBinding Foreground}"
-                                    ItemTemplate="{TemplateBinding ItemTemplate}"
+                                        ItemTemplate="{TemplateBinding ItemTemplate}"
-                                    ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                        ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                                    ScrollViewer.VerticalScrollBarVisibility="Auto" />
+                                        ScrollViewer.VerticalScrollBarVisibility="Auto" />
                             </Border>
                         </Popup>
                     </Panel>
@@ -98,4 +98,4 @@
             <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxSmallHeight}" />
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/Border.axaml

@@ -31,4 +31,4 @@
         </Style>
 
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/Button.axaml

@@ -45,6 +45,10 @@
             </ControlTemplate>
         </Setter>
 
+        <Style Selector="^:pressed">
+            <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}" />
@@ -104,9 +108,11 @@
                         Classes="Solid" />
             </FocusAdornerTemplate>
         </Setter>
-        <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+            <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}" />
@@ -266,8 +272,8 @@
     </ControlTheme>
 
     <ControlTheme x:Key="InnerIconButton" TargetType="Button">
-        <Setter Property="Width" Value="{DynamicResource SemiWidthIconMedium}" />
+        <Setter Property="Width" Value="16"/>
-        <Setter Property="Height" Value="{DynamicResource SemiWidthIconMedium}" />
+        <Setter Property="Height" Value="16"/>
         <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerForeground}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Cursor" Value="Hand" />

src/Semi.Avalonia/Controls/ButtonSpinner.axaml

@@ -98,7 +98,7 @@
             <Setter Property="Margin" Value="0 0 4 0" />
         </Style>
         <Style Selector="^:pointerover /template/ Border#ButtonGroup">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSpinnerRepeatButtonPointeroverBorderBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSpinnerRepeatButtonPointeroverBorderBrush}"/>
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/Calendar.axaml

@@ -2,11 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <Calendar />
-        </Border>
-    </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type Calendar}" TargetType="Calendar">
         <Setter Property="Foreground" Value="{DynamicResource CalendarForeground}" />
         <Setter Property="Background" Value="{DynamicResource CalendarBackground}" />
@@ -42,8 +37,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     x:DataType="x:String"
-                    FontSize="{DynamicResource CalendarItemWeekDayNameFontSize}"
+                    FontSize="12"
-                    FontWeight="{DynamicResource CalendarItemWeekDayNameFontWeight}"
                     Foreground="{DynamicResource CalendarItemWeekDayNameForeground}"
                     Text="{Binding}" />
             </Template>
@@ -64,41 +58,38 @@
                         VerticalAlignment="Stretch"
                         RowDefinitions="Auto,*">
                         <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto">
-                            <RepeatButton
+                            <Button
                                 Name="PART_PreviousButton"
                                 Grid.Column="0"
-                                Padding="0"
+                                HorizontalContentAlignment="Left"
-                                MinWidth="{Binding $self.MinHeight}"
                                 Foreground="{TemplateBinding Foreground}"
-                                Theme="{DynamicResource BorderlessRepeatButton}">
+                                Theme="{DynamicResource BorderlessButton}">
                                 <PathIcon
                                     Theme="{DynamicResource InnerPathIcon}"
                                     Classes="Large"
                                     Data="{DynamicResource CalendarItemPreviousIconGlyph}"
                                     Foreground="{DynamicResource CalendarItemIconForeground}" />
-                            </RepeatButton>
+                            </Button>
 
                             <Button
                                 Name="PART_HeaderButton"
                                 Grid.Column="1"
                                 HorizontalContentAlignment="Center"
-                                HorizontalAlignment="Stretch"
                                 Foreground="{TemplateBinding Foreground}"
                                 Theme="{DynamicResource BorderlessButton}" />
 
-                            <RepeatButton
+                            <Button
                                 Name="PART_NextButton"
                                 Grid.Column="2"
-                                Padding="0"
+                                HorizontalContentAlignment="Left"
-                                MinWidth="{Binding $self.MinHeight}"
                                 Foreground="{TemplateBinding Foreground}"
-                                Theme="{DynamicResource BorderlessRepeatButton}">
+                                Theme="{DynamicResource BorderlessButton}">
                                 <PathIcon
                                     Theme="{DynamicResource InnerPathIcon}"
                                     Classes="Large"
                                     Data="{DynamicResource CalendarItemNextIconGlyph}"
                                     Foreground="{DynamicResource CalendarItemIconForeground}" />
-                            </RepeatButton>
+                            </Button>
                         </Grid>
                         <Grid
                             Name="PART_MonthView"
@@ -253,4 +244,4 @@
             <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonDisabledForeground}" />
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/CalendarDatePicker.axaml

@@ -13,7 +13,7 @@
         <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="BackgroundSizing" Value="OuterBorderEdge"/>
         <Setter Property="IsTodayHighlighted" Value="True" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
@@ -34,7 +34,7 @@
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}" />
+                            CornerRadius="{TemplateBinding CornerRadius}"/>
                         <Grid
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
@@ -227,4 +227,4 @@
             </Style>
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/CaptionButtons.axaml

@@ -5,14 +5,15 @@
     <Design.PreviewWith>
         <CaptionButtons />
     </Design.PreviewWith>
-
     <ControlTheme x:Key="CaptionButton" TargetType="Button">
+        <Setter Property="Background" Value="{DynamicResource CaptionButtonPointeroverBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CaptionButtonPressedBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource CaptionButtonForeground}" />
-        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="CornerRadius" Value="6" />
-        <Setter Property="CornerRadius" Value="{StaticResource CaptionButtonCornerRadius}" />
+        <Setter Property="Margin" Value="0, 4" />
-        <Setter Property="Padding" Value="{StaticResource CaptionButtonPadding}" />
+        <Setter Property="Padding" Value="4" />
-        <Setter Property="Width" Value="{StaticResource CaptionButtonWidth}" />
+        <Setter Property="Height" Value="28" />
-        <Setter Property="Height" Value="{StaticResource CaptionButtonHeight}" />
+        <Setter Property="Width" Value="28" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="Template">
@@ -20,76 +21,77 @@
                 <ContentPresenter
                     Name="PART_ContentPresenter"
                     Padding="{TemplateBinding Padding}"
-                    Foreground="{TemplateBinding Foreground}"
+                    Background="Transparent"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
                     Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
                     CornerRadius="{TemplateBinding CornerRadius}" />
             </ControlTemplate>
         </Setter>
 
-        <Style Selector="^:pointerover">
+        <Style Selector="^:pointerover /template/ ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource CaptionButtonPointeroverBackground}" />
+            <Setter Property="Background" Value="{TemplateBinding Background}" />
         </Style>
 
-        <Style Selector="^:pressed">
+        <Style Selector="^:pressed /template/ ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource CaptionButtonPressedBackground}" />
+            <Setter Property="Background" Value="{TemplateBinding BorderBrush}" />
         </Style>
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type CaptionButtons}" TargetType="CaptionButtons">
         <Setter Property="Foreground" Value="{DynamicResource CaptionButtonForeground}" />
+        <Setter Property="Margin" Value="0 0 4 0" />
         <Setter Property="Template">
             <ControlTemplate TargetType="CaptionButtons">
-                <StackPanel Orientation="Horizontal">
+                <StackPanel
+                    VerticalAlignment="Stretch"
+                    Orientation="Horizontal"
+                    Spacing="2"
+                    TextElement.FontSize="10">
                     <Button Name="PART_FullScreenButton" Theme="{StaticResource CaptionButton}">
                         <PathIcon
                             Name="PART_FullScreenButtonIcon"
-                            Theme="{StaticResource InnerPathIcon}"
+                            Theme="{DynamicResource InnerPathIcon}"
-                            Data="{StaticResource WindowExpandGlyph}"
+                            Data="{DynamicResource WindowExpandGlyph}"
                             Foreground="{Binding $parent[Button].Foreground}" />
                     </Button>
                     <Button Name="PART_MinimizeButton" Theme="{StaticResource CaptionButton}">
                         <PathIcon
-                            Name="PART_MinimizeButtonIcon"
+                            Theme="{DynamicResource InnerPathIcon}"
-                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{DynamicResource WindowMinimizeGlyph}"
-                            Data="{StaticResource WindowMinimizeGlyph}"
                             Foreground="{Binding $parent[Button].Foreground}" />
                     </Button>
                     <Button Name="PART_RestoreButton" Theme="{StaticResource CaptionButton}">
                         <PathIcon
                             Name="PART_RestoreButtonIcon"
-                            Theme="{StaticResource InnerPathIcon}"
+                            Theme="{DynamicResource InnerPathIcon}"
-                            Data="{StaticResource WindowMaximizeGlyph}"
+                            Data="{DynamicResource WindowMaximizeGlyph}"
                             Foreground="{Binding $parent[Button].Foreground}" />
                     </Button>
-                    <Button Name="PART_CloseButton" Theme="{StaticResource CaptionButton}">
+                    <Button
+                        Name="PART_CloseButton"
+                        Background="{DynamicResource CaptionButtonClosePointeroverBackground}"
+                        BorderBrush="{DynamicResource CaptionButtonClosePressedBackground}"
+                        Theme="{StaticResource CaptionButton}">
+                        <Button.Styles>
+                            <Style Selector="Button:pointerover">
+                                <Setter Property="Foreground" Value="White" />
+                            </Style>
+                            <Style Selector="Button:pressed">
+                                <Setter Property="Foreground" Value="White" />
+                            </Style>
+                        </Button.Styles>
                         <PathIcon
-                            Name="PART_CloseButtonIcon"
+                            Theme="{DynamicResource InnerPathIcon}"
-                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{DynamicResource WindowCloseIconGlyph}"
-                            Data="{StaticResource WindowCloseIconGlyph}"
                             Foreground="{Binding $parent[Button].Foreground}" />
                     </Button>
                 </StackPanel>
             </ControlTemplate>
         </Setter>
-
-        <Style Selector="^ /template/ Button#PART_CloseButton:pointerover">
-            <Setter Property="Foreground" Value="{DynamicResource CaptionButtonCloseForeground}" />
-            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePointeroverBackground}" />
-        </Style>
-        <Style Selector="^ /template/ Button#PART_CloseButton:pressed">
-            <Setter Property="Foreground" Value="{DynamicResource CaptionButtonCloseForeground}" />
-            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePressedBackground}" />
-        </Style>
-
         <Style Selector="^:maximized /template/ PathIcon#PART_RestoreButtonIcon">
-            <Setter Property="Data" Value="{StaticResource WindowRestoreGlyph}" />
+            <Setter Property="Data" Value="{DynamicResource WindowRestoreGlyph}" />
         </Style>
         <Style Selector="^:fullscreen /template/ PathIcon#PART_FullScreenButtonIcon">
-            <Setter Property="Data" Value="{StaticResource WindowCollapseGlyph}" />
+            <Setter Property="Data" Value="{DynamicResource WindowCollapseGlyph}" />
         </Style>
         <Style Selector="^:fullscreen /template/ Button#PART_RestoreButton">
             <Setter Property="IsVisible" Value="False" />
@@ -98,4 +100,4 @@
             <Setter Property="IsVisible" Value="False" />
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/Carousel.axaml

@@ -83,7 +83,7 @@
 
     <ControlTheme x:Key="CarouselIndicatorDotListBoxItem" TargetType="ListBoxItem">
         <Setter Property="Foreground" Value="{DynamicResource CarouselIndicatorForeground}" />
-        <Setter Property="Margin" Value="4 0" />
+        <Setter Property="Margin" Value="4 0"/>
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
@@ -108,7 +108,7 @@
     <ControlTheme x:Key="CarouselIndicatorLineListBoxItem"
                   BasedOn="{StaticResource CarouselIndicatorDotListBoxItem}"
                   TargetType="ListBoxItem">
-        <Setter Property="Margin" Value="2 0" />
+        <Setter Property="Margin" Value="2 0"/>
         <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <Rectangle
@@ -122,9 +122,9 @@
     <ControlTheme x:Key="CarouselIndicatorColumnarListBoxItem"
                   BasedOn="{StaticResource CarouselIndicatorDotListBoxItem}"
                   TargetType="ListBoxItem">
-        <Setter Property="Width" Value="{DynamicResource CarouselIndicatorColumnarWidth}" />
+        <Setter Property="Width" Value="{DynamicResource CarouselIndicatorColumnarWidth}"/>
-        <Setter Property="Height" Value="{DynamicResource CarouselIndicatorColumnarSelectedHeight}" />
+        <Setter Property="Height" Value="{DynamicResource CarouselIndicatorColumnarSelectedHeight}"/>
-        <Setter Property="Margin" Value="2 0" />
+        <Setter Property="Margin" Value="2 0"/>
         <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <Rectangle
@@ -250,4 +250,4 @@
             <Setter Property="HorizontalAlignment" Value="Right" />
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/CheckBox.axaml

@@ -33,7 +33,6 @@
                     CornerRadius="{TemplateBinding CornerRadius}">
                     <Grid ColumnDefinitions="Auto,*">
                         <Panel
-                            Name="PART_GlyphPanel"
                             Grid.Column="0"
                             TemplatedControl.IsTemplateFocusTarget="True"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
@@ -70,69 +69,131 @@
             </ControlTemplate>
         </Setter>
 
-        <Style Selector="^:unchecked">
+        <!--  Unchecked Pointerover State  -->
-            <Style Selector="^:pointerover /template/ Border#NormalRectangle">
+        <Style Selector="^:pointerover">
+            <Style Selector="^ /template/ Border#NormalRectangle">
                 <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxPointeroverBorderBrush}" />
                 <Setter Property="Background" Value="{DynamicResource CheckBoxPointeroverBackground}" />
             </Style>
-            <Style Selector="^:pressed /template/ Border#NormalRectangle">
+        </Style>
+
+        <!--  Unchecked Pressed State  -->
+        <Style Selector="^:pressed">
+            <Style Selector="^ /template/ Border#NormalRectangle">
                 <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxPressedBorderBrush}" />
                 <Setter Property="Background" Value="{DynamicResource CheckBoxPressedBackground}" />
             </Style>
-            <Style Selector="^:disabled">
+        </Style>
-                <Style Selector="^ /template/ Border#NormalRectangle">
+
-                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxDefaultDisabledBorderBrush}" />
+        <!--  Unchecked Disabled state  -->
-                    <Setter Property="Background" Value="{DynamicResource CheckBoxDefaultDisabledBackground}" />
+        <Style Selector="^:disabled">
-                </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource CheckBoxDisabledForeground}" />
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxDisabledForeground}" />
+            </Style>
-                </Style>
+            <Style Selector="^ /template/ Border#NormalRectangle">
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxDefaultDisabledBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckBoxDefaultDisabledBackground}" />
             </Style>
         </Style>
 
-        <Style Selector="^:indeterminate,^:checked">
+        <Style Selector="^:checked">
             <Style Selector="^ /template/ Border#NormalRectangle">
                 <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedDefaultBorderBrush}" />
                 <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDefaultBackground}" />
             </Style>
-            <Style Selector="^:pointerover /template/ Border#NormalRectangle">
+
-                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointeroverBorderBrush}" />
+            <Style Selector="^ /template/ PathIcon#CheckGlyph">
-                <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPointeroverBackground}" />
+                <Setter Property="Data" Value="{DynamicResource CheckBoxCheckGlyph}" />
+                <Setter Property="Opacity" Value="1" />
             </Style>
-            <Style Selector="^:pressed /template/ Border#NormalRectangle">
+
-                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPressedBorderBrush}" />
+            <!--  Checked Pointerover State  -->
-                <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPressedBackground}" />
+            <Style Selector="^:pointerover">
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointeroverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPointeroverBackground}" />
+                </Style>
             </Style>
+
+            <!--  Checked Pressed State  -->
+            <Style Selector="^:pressed">
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPressedBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPressedBackground}" />
+                </Style>
+            </Style>
+
+            <!--  Checked Disabled State  -->
             <Style Selector="^:disabled">
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxDisabledForeground}" />
+                </Style>
                 <Style Selector="^ /template/ Border#NormalRectangle">
                     <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedDisabledBorderBrush}" />
                     <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                 </Style>
-                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxDisabledForeground}" />
+                <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                 </Style>
             </Style>
         </Style>
 
-        <Style Selector="^:indeterminate /template/ PathIcon#CheckGlyph">
+        <Style Selector="^:indeterminate">
-            <Setter Property="Data" Value="{DynamicResource CheckBoxIndeterminateGlyph}" />
+            <Style Selector="^ /template/ Border#NormalRectangle">
-        </Style>
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedDefaultBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDefaultBackground}" />
+            </Style>
 
-        <Style Selector="^:checked /template/ PathIcon#CheckGlyph">
+            <Style Selector="^ /template/ PathIcon#CheckGlyph">
-            <Setter Property="Data" Value="{DynamicResource CheckBoxCheckGlyph}" />
+                <Setter Property="Data" Value="{DynamicResource CheckBoxIndeterminateGlyph}" />
-        </Style>
+                <Setter Property="Opacity" Value="1" />
+            </Style>
 
-        <Style Selector="^:disabled">
+            <!--  Checked Pointerover State  -->
-            <Style Selector="^ /template/ Panel#PART_GlyphPanel">
+            <Style Selector="^:pointerover">
-                <Setter Property="Opacity" Value="0.75" />
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointeroverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPointeroverBackground}" />
+                </Style>
+            </Style>
+
+            <!--  Checked Pressed State  -->
+            <Style Selector="^:pressed">
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPressedBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPressedBackground}" />
+                </Style>
+            </Style>
+
+            <!--  Checked Disabled State  -->
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxDisabledForeground}" />
+                </Style>
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedDisabledBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
+                </Style>
+
+                <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                </Style>
             </Style>
         </Style>
     </ControlTheme>
 
-    <ControlTheme
+    <ControlTheme x:Key="SimpleCheckBox" TargetType="CheckBox">
-        x:Key="SimpleCheckBox"
+        <Setter Property="HorizontalAlignment" Value="Left" />
-        BasedOn="{StaticResource {x:Type CheckBox}}"
+        <Setter Property="VerticalAlignment" Value="Top" />
-        TargetType="CheckBox">
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="{DynamicResource CheckBoxFontSize}" />
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForeground}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxDefaultBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxDefaultBorderBrush}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource CheckBoxBoxCornerRadius}" />
+        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Template">
             <ControlTemplate TargetType="CheckBox">
                 <Border
@@ -141,28 +202,135 @@
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}">
-                    <Panel
+                    <Grid ColumnDefinitions="Auto,*">
-                        Name="PART_GlyphPanel"
+                        <Panel
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            Grid.Column="0"
-                        <Border
+                            TemplatedControl.IsTemplateFocusTarget="True"
-                            Name="NormalRectangle"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                            Width="{DynamicResource CheckBoxBoxWidth}"
+                            <Border
-                            Height="{DynamicResource CheckBoxBoxHeight}"
+                                Name="NormalRectangle"
-                            Background="{DynamicResource CheckBoxDefaultBackground}"
+                                Width="{DynamicResource CheckBoxBoxWidth}"
-                            BorderBrush="{DynamicResource CheckBoxDefaultBorderBrush}"
+                                Height="{DynamicResource CheckBoxBoxHeight}"
-                            BorderThickness="{DynamicResource CheckBoxBoxBorderThickness}"
+                                Background="{DynamicResource CheckBoxDefaultBackground}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
+                                BorderBrush="{DynamicResource CheckBoxDefaultBorderBrush}"
-                            UseLayoutRounding="False" />
+                                BorderThickness="{DynamicResource CheckBoxBoxBorderThickness}"
-                        <PathIcon
+                                CornerRadius="{TemplateBinding CornerRadius}"
-                            Name="CheckGlyph"
+                                UseLayoutRounding="False" />
-                            Theme="{DynamicResource InnerPathIcon}"
+                            <PathIcon
-                            Width="{DynamicResource CheckBoxBoxGlyphWidth}"
+                                Name="CheckGlyph"
-                            Height="{DynamicResource CheckBoxBoxGlyphHeight}"
+                                Theme="{DynamicResource InnerPathIcon}"
-                            Foreground="{DynamicResource CheckBoxGlyphFill}" />
+                                Width="{DynamicResource CheckBoxBoxGlyphWidth}"
-                    </Panel>
+                                Height="{DynamicResource CheckBoxBoxGlyphHeight}"
+                                Foreground="{DynamicResource CheckBoxGlyphFill}" />
+                        </Panel>
+                    </Grid>
                 </Border>
             </ControlTemplate>
         </Setter>
+
+        <!--  Unchecked Pointerover State  -->
+        <Style Selector="^:pointerover">
+            <Style Selector="^ /template/ Border#NormalRectangle">
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckBoxPointeroverBackground}" />
+            </Style>
+        </Style>
+
+        <!--  Unchecked Pressed State  -->
+        <Style Selector="^:pressed">
+            <Style Selector="^ /template/ Border#NormalRectangle">
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckBoxPressedBackground}" />
+            </Style>
+        </Style>
+
+        <!--  Unchecked Disabled state  -->
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ Border#NormalRectangle">
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxDefaultDisabledBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckBoxDefaultDisabledBackground}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:checked">
+            <Style Selector="^ /template/ Border#NormalRectangle">
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedDefaultBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDefaultBackground}" />
+            </Style>
+
+            <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                <Setter Property="Data" Value="{DynamicResource CheckBoxCheckGlyph}" />
+                <Setter Property="Opacity" Value="1" />
+            </Style>
+
+            <!--  Checked Pointerover State  -->
+            <Style Selector="^:pointerover">
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointeroverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPointeroverBackground}" />
+                </Style>
+            </Style>
+
+            <!--  Checked Pressed State  -->
+            <Style Selector="^:pressed">
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPressedBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPressedBackground}" />
+                </Style>
+            </Style>
+
+            <!--  Checked Disabled State  -->
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedDisabledBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
+                </Style>
+
+                <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                </Style>
+            </Style>
+        </Style>
+
+        <Style Selector="^:indeterminate">
+            <Style Selector="^ /template/ Border#NormalRectangle">
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedDefaultBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDefaultBackground}" />
+            </Style>
+
+            <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                <Setter Property="Data" Value="{DynamicResource CheckBoxIndeterminateGlyph}" />
+                <Setter Property="Opacity" Value="1" />
+            </Style>
+
+            <!--  Checked Pointerover State  -->
+            <Style Selector="^:pointerover">
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointeroverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPointeroverBackground}" />
+                </Style>
+            </Style>
+
+            <!--  Checked Pressed State  -->
+            <Style Selector="^:pressed">
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPressedBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPressedBackground}" />
+                </Style>
+            </Style>
+
+            <!--  Checked Disabled State  -->
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedDisabledBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
+                </Style>
+
+                <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                </Style>
+            </Style>
+        </Style>
     </ControlTheme>
 
     <ControlTheme x:Key="CardCheckBox" TargetType="CheckBox">
@@ -188,7 +356,6 @@
                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                         ColumnDefinitions="Auto,*">
                         <Panel
-                            Name="PART_GlyphPanel"
                             Grid.Column="0"
                             VerticalAlignment="Top"
                             Margin="{DynamicResource CheckBoxBoxMargin}">
@@ -227,42 +394,53 @@
             </ControlTemplate>
         </Setter>
 
-        <Style Selector="^:unchecked">
+        <!--  Unchecked Pointerover State  -->
-            <Style Selector="^:pointerover">
+        <Style Selector="^:pointerover">
-                <Style Selector="^ /template/ Border#NormalRectangle">
+            <Style Selector="^ /template/ Border#NormalRectangle">
-                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxPointeroverBorderBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxPointeroverBorderBrush}" />
-                </Style>
-                <Style Selector="^ /template/ Border#RootBorder">
-                    <Setter Property="Background" Value="{DynamicResource CheckBoxCardPointeroverBackground}" />
-                </Style>
             </Style>
-            <Style Selector="^:pressed">
+            <Style Selector="^ /template/ Border#RootBorder">
-                <Style Selector="^ /template/ Border#NormalRectangle">
+                <Setter Property="Background" Value="{DynamicResource CheckBoxCardPointeroverBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxPressedBorderBrush}" />
-                </Style>
-                <Style Selector="^ /template/ Border#RootBorder">
-                    <Setter Property="Background" Value="{DynamicResource CheckBoxCardPressedBackground}" />
-                </Style>
-            </Style>
-            <Style Selector="^:disabled">
-                <Style Selector="^ /template/ Border#NormalRectangle">
-                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxDefaultDisabledBorderBrush}" />
-                    <Setter Property="Background" Value="{DynamicResource CheckBoxDefaultDisabledBackground}" />
-                </Style>
-                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxDisabledForeground}" />
-                </Style>
             </Style>
         </Style>
 
-        <Style Selector="^:indeterminate,^:checked">
+        <!--  Unchecked Pressed State  -->
+        <Style Selector="^:pressed">
+            <Style Selector="^ /template/ Border#NormalRectangle">
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxPressedBorderBrush}" />
+            </Style>
+            <Style Selector="^ /template/ Border#RootBorder">
+                <Setter Property="Background" Value="{DynamicResource CheckBoxCardPressedBackground}" />
+            </Style>
+        </Style>
+
+        <!--  Unchecked Disabled state  -->
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource CheckBoxDisabledForeground}" />
+            </Style>
+            <Style Selector="^ /template/ Border#NormalRectangle">
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxDefaultDisabledBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckBoxDefaultDisabledBackground}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:checked">
+            <Style Selector="^ /template/ Border#RootBorder">
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckBoxCardCheckedBackground}" />
+            </Style>
             <Style Selector="^ /template/ Border#NormalRectangle">
                 <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedDefaultBorderBrush}" />
                 <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDefaultBackground}" />
             </Style>
-            <Style Selector="^ /template/ Border#RootBorder">
+
-                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedBorderBrush}" />
+            <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                <Setter Property="Data" Value="{DynamicResource CheckBoxCheckGlyph}" />
+                <Setter Property="Opacity" Value="1" />
             </Style>
+
+            <!--  Checked Pointerover State  -->
             <Style Selector="^:pointerover">
                 <Style Selector="^ /template/ Border#NormalRectangle">
                     <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointeroverBorderBrush}" />
@@ -272,6 +450,8 @@
                     <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedPointeroverBorderBrush}" />
                 </Style>
             </Style>
+
+            <!--  Checked Pressed State  -->
             <Style Selector="^:pressed">
                 <Style Selector="^ /template/ Border#NormalRectangle">
                     <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPressedBorderBrush}" />
@@ -281,36 +461,78 @@
                     <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedPressedBorderBrush}" />
                 </Style>
             </Style>
+
+            <!--  Checked Disabled State  -->
             <Style Selector="^:disabled">
-                <Style Selector="^ /template/ Border#NormalRectangle">
-                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedDisabledBorderBrush}" />
-                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
-                </Style>
                 <Style Selector="^ /template/ Border#RootBorder">
                     <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedDisabledBorderBrush}" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource CheckBoxDisabledForeground}" />
                 </Style>
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedDisabledBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
+                </Style>
+
+                <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                </Style>
             </Style>
         </Style>
 
-        <Style Selector="^:indeterminate /template/ PathIcon#CheckGlyph">
+        <Style Selector="^:indeterminate">
-            <Setter Property="Data" Value="{DynamicResource CheckBoxIndeterminateGlyph}" />
-        </Style>
-
-        <Style Selector="^:checked">
-            <Style Selector="^ /template/ PathIcon#CheckGlyph">
-                <Setter Property="Data" Value="{DynamicResource CheckBoxCheckGlyph}" />
-            </Style>
             <Style Selector="^ /template/ Border#RootBorder">
-                <Setter Property="Background" Value="{DynamicResource CheckBoxCardCheckedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedBorderBrush}" />
+            </Style>
+            <Style Selector="^ /template/ Border#NormalRectangle">
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedDefaultBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDefaultBackground}" />
             </Style>
-        </Style>
 
-        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ PathIcon#CheckGlyph">
-            <Style Selector="^ /template/ Panel#PART_GlyphPanel">
+                <Setter Property="Data" Value="{DynamicResource CheckBoxIndeterminateGlyph}" />
-                <Setter Property="Opacity" Value="0.75" />
+                <Setter Property="Opacity" Value="1" />
+            </Style>
+
+            <!--  Checked Pointerover State  -->
+            <Style Selector="^:pointerover">
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointeroverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPointeroverBackground}" />
+                </Style>
+                <Style Selector="^ /template/ Border#RootBorder">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedPointeroverBorderBrush}" />
+                </Style>
+            </Style>
+
+            <!--  Checked Pressed State  -->
+            <Style Selector="^:pressed">
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPressedBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPressedBackground}" />
+                </Style>
+                <Style Selector="^ /template/ Border#RootBorder">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedPressedBorderBrush}" />
+                </Style>
+            </Style>
+
+            <!--  Checked Disabled State  -->
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ Border#RootBorder">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedDisabledBorderBrush}" />
+                </Style>
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxDisabledForeground}" />
+                </Style>
+                <Style Selector="^ /template/ Border#NormalRectangle">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedDisabledBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
+                </Style>
+
+                <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                </Style>
             </Style>
         </Style>
     </ControlTheme>
@@ -344,19 +566,50 @@
             </ControlTemplate>
         </Setter>
 
-        <Style Selector="^:unchecked">
+        <!--  Unchecked Pointerover State  -->
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Style Selector="^:pointerover">
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource CheckBoxCardPointeroverBackground}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        </Style>
+
+        <!--  Unchecked Pressed State  -->
+        <Style Selector="^:pressed">
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource CheckBoxCardPressedBackground}" />
             </Style>
-            <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        </Style>
+
+        <!--  Unchecked Disabled state  -->
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Foreground" Value="{DynamicResource CheckBoxDisabledForeground}" />
             </Style>
         </Style>
 
-        <Style Selector="^:indeterminate,^:checked">
+        <Style Selector="^:checked">
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckBoxCardCheckedBackground}" />
+            </Style>
+            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedPointeroverBorderBrush}" />
+            </Style>
+            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedPressedBorderBrush}" />
+            </Style>
+            <!--  Checked Disabled State  -->
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedDisabledBorderBrush}" />
+                </Style>
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxDisabledForeground}" />
+                </Style>
+            </Style>
+        </Style>
+
+        <Style Selector="^:indeterminate">
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedBorderBrush}" />
             </Style>
@@ -370,14 +623,7 @@
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                     <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedDisabledBorderBrush}" />
                 </Style>
-                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxDisabledForeground}" />
-                </Style>
             </Style>
         </Style>
-
-        <Style Selector="^:checked /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource CheckBoxCardCheckedBackground}" />
-        </Style>
     </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/ComboBox.axaml

@@ -12,7 +12,7 @@
                 <ComboBoxItem>BBB</ComboBoxItem>
                 <ComboBoxItem>CCC</ComboBoxItem>
             </ComboBox>
-            <ComboBox Width="100" PlaceholderText="Select" PlaceholderForeground="Red">
+            <ComboBox Width="100" PlaceholderText="Select">
                 <ComboBoxItem>AAA</ComboBoxItem>
                 <ComboBoxItem>BBB</ComboBoxItem>
                 <ComboBoxItem>CCC</ComboBoxItem>
@@ -44,7 +44,6 @@
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="MinHeight" Value="{DynamicResource ComboBoxDefaultHeight}" />
-        <Setter Property="PlaceholderForeground" Value="{DynamicResource ComboBoxSelectorPlaceHolderForeground}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="ComboBox">
                 <DataValidationErrors>
@@ -66,8 +65,9 @@
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             TextTrimming="CharacterEllipsis"
-                            Foreground="{TemplateBinding PlaceholderForeground}"
+                            Foreground="{TemplateBinding Foreground}"
                             IsVisible="{TemplateBinding SelectionBoxItem,Converter={x:Static ObjectConverters.IsNull}}"
+                            Opacity="0.3"
                             Text="{TemplateBinding PlaceholderText}" />
                         <ContentPresenter
                             Name="ContentPresenter"
@@ -137,7 +137,7 @@
                 <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}}" />
+                <Setter Property="IsVisible" Value="{Binding $parent[ComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}"/>
             </Style>
         </Style>
 
@@ -320,4 +320,4 @@
         </Style>
 
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>