From f0d0ed918ad56d51b1e3de2542f875e4857b4f32 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Fri, 17 Mar 2023 23:12:24 +0800 Subject: [PATCH] feat: add checkbox border style --- .../Pages/CheckBoxDemo.axaml | 86 +++++++-- src/Semi.Avalonia/Controls/CheckBox.axaml | 177 +++++++++++++++++- src/Semi.Avalonia/Themes/Dark/CheckBox.axaml | 10 + src/Semi.Avalonia/Themes/Light/CheckBox.axaml | 11 ++ 4 files changed, 269 insertions(+), 15 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml index 3ae1044..789e110 100644 --- a/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml @@ -7,18 +7,76 @@ 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 团队共同设计开发并维护的设计系统 + + + + diff --git a/src/Semi.Avalonia/Controls/CheckBox.axaml b/src/Semi.Avalonia/Controls/CheckBox.axaml index 3c03378..6f12fd2 100644 --- a/src/Semi.Avalonia/Controls/CheckBox.axaml +++ b/src/Semi.Avalonia/Controls/CheckBox.axaml @@ -4,8 +4,8 @@ x:CompileBindings="True"> - + @@ -21,6 +21,7 @@ x:Name="PART_Border" Grid.Column="0" Grid.ColumnSpan="2" + HorizontalAlignment="Center" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" @@ -175,4 +176,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml index 1b0f815..e4aa3d7 100644 --- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml @@ -40,4 +40,14 @@ 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/Light/CheckBox.axaml b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml index b9d3302..a7762d4 100644 --- a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml +++ b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml @@ -40,4 +40,15 @@ 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 +