misc: update dependency. update documentation.

Merge pull request #369 from gehongyan/fix-disableglyph
Fix CheckBoxGlyphDisabledFill does not work
2026-03-03 00:00:55 +08:00 · 2024-06-28 22:34:34 +08:00 · 2024-06-27 10:24:50 +08:00 · 2024-06-26 11:34:32 +08:00 · 2024-06-24 21:38:30 +08:00 · 2024-06-24 16:54:15 +08:00
11 changed files with 33 additions and 36 deletions
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ If you are looking for more customized controls, Please try [Ursa](https://githu
 ### Installation

 ```bash
-dotnet add package Semi.Avalonia --version 11.0.7
+dotnet add package Semi.Avalonia
 ```

 Include Semi Design Styles in application:
@@ -32,9 +32,9 @@ That's all.
 ColorPicker, DataGrid and TreeDataGrid are distributed in separated packages. Please install if you need.

 ```bash
-dotnet add package Semi.Avalonia.ColorPicker --version 11.0.7
-dotnet add package Semi.Avalonia.DataGrid --version 11.0.7
-dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.7
+dotnet add package Semi.Avalonia.ColorPicker
+dotnet add package Semi.Avalonia.DataGrid
+dotnet add package Semi.Avalonia.TreeDataGrid
 ```

 ```xaml
@@ -90,13 +90,10 @@ We offer limited free community support for Semi Avalonia and Ursa. If you have

 | Semi Design Version | Avalonia Version |
 |:--------------------|:-----------------|
+| 11.1.0-rc           | >=11.1.0-rc      |
 | 11.0.7              | >=11.0.7         |
 | 11.0.1              | <=11.0.6         |

-## TODO
-
-* FocusAdorner
-
 ## Credits

 [Semi Design](https://semi.design/)
--- a/README_CN.md
+++ b/README_CN.md
@@ -16,7 +16,7 @@ Avalonia UI 控件主题，灵感来自 Semi Design
 ### 安装

 ```bash
-dotnet add package Semi.Avalonia --version 11.0.7
+dotnet add package Semi.Avalonia
 ```

 在样式中引用 Semi 主题：
@@ -32,9 +32,9 @@ dotnet add package Semi.Avalonia --version 11.0.7
 ColorPicker， DataGrid 和 TreeDataGrid 的样式单独分发，如果需要请安装并引用。

 ```bash
-dotnet add package Semi.Avalonia.ColorPicker --version 11.0.7
-dotnet add package Semi.Avalonia.DataGrid --version 11.0.7
-dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.7
+dotnet add package Semi.Avalonia.ColorPicker
+dotnet add package Semi.Avalonia.DataGrid
+dotnet add package Semi.Avalonia.TreeDataGrid
 ```

 ```xaml
@@ -92,13 +92,10 @@ rd.xml 文件的内容如下：

 | Semi Design Version | Avalonia Version |
 |:--------------------|:-----------------|
+| 11.1.0-rc           | >=11.1.0-rc      |
 | 11.0.7              | >=11.0.7         |
 | 11.0.1              | <=11.0.6         |

-## 代办事项
-
-* FocusAdorner
-
 ## 致谢

 [Semi Design](https://semi.design/)
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
    <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.1.0-beta2</AvaloniaVersion>
+    <AvaloniaVersion>11.1.0-rc1</AvaloniaVersion>
  </PropertyGroup>
 </Project>
--- a/demo/global.json
+++ b/demo/global.json
@@ -1,5 +1,5 @@
 {
    "sdk": {
-        "version": "7.0"
+        "version": "8.0"
    }
 }
--- a/src/Package.props
+++ b/src/Package.props
@@ -3,14 +3,14 @@
        <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
        <Nullable>enable</Nullable>
        <LangVersion>latest</LangVersion>
-        <Version>11.1.0-beta2</Version>
+        <Version>11.1.0-rc2</Version>
        <Authors>IRIHI Technology Co., Ltd.</Authors>
        <Description>Avalonia Theme inspired by Semi Design.</Description>
        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
        <PackageLicenseExpression>MIT</PackageLicenseExpression>
        <PackageIcon>irihi.png</PackageIcon>
        <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
-        <AvaloniaVersion>11.1.0-beta2</AvaloniaVersion>
+        <AvaloniaVersion>11.1.0-rc1</AvaloniaVersion>
    </PropertyGroup>

    <ItemGroup>
--- a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
+++ b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
@@ -4,7 +4,7 @@

    <PropertyGroup>
        <Title>Semi.Avalonia.ColorPicker</Title>
-        <PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1-rc1</PackageReleaseNotes>
    </PropertyGroup>

    <ItemGroup>
--- a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
+++ b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
@@ -4,7 +4,7 @@
    
    <PropertyGroup>
        <Title>Semi.Avalonia.DataGrid</Title>
-        <PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1-rc1</PackageReleaseNotes>
    </PropertyGroup>

    <ItemGroup>
--- a/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
+++ b/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
@@ -4,7 +4,7 @@
        <TargetFramework>net6.0</TargetFramework>
        <Nullable>enable</Nullable>
        <LangVersion>latest</LangVersion>
-        <Version>11.0.1</Version>
+        <PackageReleaseNotes>Update to Avalonia 11.1-rc1</PackageReleaseNotes>
        <Authors>IRIHI Technology Co., Ltd.</Authors>
        <Description>Avalonia Theme inspired by Semi Design.</Description>
        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
--- a/src/Semi.Avalonia/Controls/CheckBox.axaml
+++ b/src/Semi.Avalonia/Controls/CheckBox.axaml
@@ -123,8 +123,8 @@
                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                </Style>

-                <Style Selector="^ /template/ Path#CheckGlyph">
-                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                </Style>
            </Style>
        </Style>
@@ -166,8 +166,8 @@
                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                </Style>

-                <Style Selector="^ /template/ Path#CheckGlyph">
-                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                </Style>
            </Style>
        </Style>
@@ -275,8 +275,8 @@
                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                </Style>

-                <Style Selector="^ /template/ Path#CheckGlyph">
-                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                </Style>
            </Style>
        </Style>
@@ -315,8 +315,8 @@
                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                </Style>

-                <Style Selector="^ /template/ Path#CheckGlyph">
-                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                </Style>
            </Style>
        </Style>
@@ -457,8 +457,8 @@
                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                </Style>

-                <Style Selector="^ /template/ Path#CheckGlyph">
-                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                </Style>
            </Style>
        </Style>
@@ -512,8 +512,8 @@
                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                </Style>

-                <Style Selector="^ /template/ Path#CheckGlyph">
-                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                </Style>
            </Style>
        </Style>
--- a/src/Semi.Avalonia/Controls/Menu.axaml
+++ b/src/Semi.Avalonia/Controls/Menu.axaml
@@ -159,6 +159,7 @@
                                HorizontalAlignment="Stretch"
                                VerticalAlignment="Center"
                                Content="{TemplateBinding Header}"
+                                ContentTemplate="{TemplateBinding HeaderTemplate}"
                                RecognizesAccessKey="True" />
                            <TextBlock
                                x:Name="PART_InputGestureText"
@@ -300,6 +301,7 @@
                            HorizontalAlignment="Stretch"
                            VerticalAlignment="Center"
                            Content="{TemplateBinding Header}"
+                            ContentTemplate="{TemplateBinding HeaderTemplate}"
                            RecognizesAccessKey="True" />
                        <Popup
                            Name="PART_Popup"
--- a/src/Semi.Avalonia/Semi.Avalonia.csproj
+++ b/src/Semi.Avalonia/Semi.Avalonia.csproj
@@ -4,7 +4,8 @@

    <PropertyGroup>
        <Title>Semi.Avalonia</Title>
-        <PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1-rc1</PackageReleaseNotes>
+        <IsAotCompatible>true</IsAotCompatible>
    </PropertyGroup>

    <ItemGroup>
Author	SHA1	Message	Date
rabbitism	139c0b926c	misc: update dependency. update documentation.	2024-06-28 22:34:34 +08:00
Zhang Dian	b378cdf880	Merge pull request #369 from gehongyan/fix-disableglyph Fix CheckBoxGlyphDisabledFill does not work	2024-06-27 10:24:50 +08:00
Gehongyan	57646f5390	fix: fix CheckBoxGlyphDisabledFill does not work Issue #368	2024-06-26 11:34:32 +08:00
Zhang Dian	9e5d5298c4	Merge pull request #367 from irihitech/issue/359 Fix TopLevelMenuItem HeaderTemplate	2024-06-24 21:38:30 +08:00
Zhang Dian	0fb1e585db	fix: fix TopLevelMenuItem HeaderTemplate.	2024-06-24 16:54:15 +08:00
rabbitism	d5dce72a34	Merge remote-tracking branch 'origin/main'	2024-06-15 19:35:35 +08:00
rabbitism	b1a29c67a9	feat: bump version.	2024-06-15 19:34:48 +08:00
Dong Bin	471106f825	Merge pull request #361 from irihitech/issue/359 Add ContentTemplate to MenuItem Header	2024-05-29 22:27:08 +08:00
Zhang Dian	ec070d2f67	fix: add ContentTemplate to MenuItem Header.	2024-05-29 22:11:50 +08:00