diff --git a/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml index 3ae1044..7adda8c 100644 --- a/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml @@ -7,18 +7,138 @@ d:DesignHeight="450" d:DesignWidth="800" mc:Ignorable="d"> - - Unchecked - Unchecked - Checked - Checked - Indeterminate - - Indeterminate - - Checkbox should wrap its text - + + + Unchecked + Unchecked + Checked + Checked + Indeterminate + + Indeterminate + + Checkbox should wrap its text + + + + + 复选框标题 + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + + + 复选框标题 + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + + + 复选框标题 + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + + + 复选框标题 + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + + + 复选框标题 + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + + + 复选框标题 + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + + + + + + 复选框标题 + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + + + 复选框标题 + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + + + 复选框标题 + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + + + 复选框标题 + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + + + 复选框标题 + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + + + 复选框标题 + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + + + diff --git a/src/Semi.Avalonia/Controls/CheckBox.axaml b/src/Semi.Avalonia/Controls/CheckBox.axaml index 3c03378..4560c8b 100644 --- a/src/Semi.Avalonia/Controls/CheckBox.axaml +++ b/src/Semi.Avalonia/Controls/CheckBox.axaml @@ -4,16 +4,17 @@ x:CompileBindings="True"> - + - - + + + - - - + + + @@ -21,6 +22,7 @@ x:Name="PART_Border" Grid.Column="0" Grid.ColumnSpan="2" + HorizontalAlignment="Center" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" @@ -32,18 +34,18 @@ VerticalAlignment="Center"> + Width="{DynamicResource CheckBoxBoxGlyphWidth}" + Height="{DynamicResource CheckBoxBoxGlyphHeight}" + Foreground="{DynamicResource CheckBoxGlyphFill}" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml index 1b0f815..05fdd25 100644 --- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml @@ -2,42 +2,54 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=System.Runtime"> - - + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - 14 - 16 - 16 - 12 - 12 - 400 + 14 + 16 + 16 + 10 + 10 + 400 - 3 - 8 0 0 0 - 1 + 3 + 8 0 0 0 + 1 M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z M5 12.5C5 11.6716 5.67157 11 6.5 11H17.5C18.3284 11 19 11.6716 19 12.5C19 13.3284 18.3284 14 17.5 14H6.5C5.67157 14 5 13.3284 5 12.5Z + + + + + + + + + + 1 + 16 + 3 diff --git a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml index 8ca35e3..ffe3010 100644 --- a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml @@ -28,7 +28,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml index b9d3302..b11de2d 100644 --- a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml +++ b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml @@ -2,42 +2,55 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=System.Runtime"> - - + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - 14 - 16 - 16 - 12 - 12 - 400 + 14 + 16 + 16 + 10 + 10 + 400 - 3 - 8 0 0 0 - 1 + 3 + 8 0 0 0 + 1 M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z M5 12.5C5 11.6716 5.67157 11 6.5 11H17.5C18.3284 11 19 11.6716 19 12.5C19 13.3284 18.3284 14 17.5 14H6.5C5.67157 14 5 13.3284 5 12.5Z + + + + + + + + + + 1 + 16 + 3 +