diff --git a/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml index b7ef18f..204599d 100644 --- a/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml @@ -26,6 +26,27 @@ Checkbox should wrap its text + + + + + + + + + + + diff --git a/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml index 59814fc..f884c40 100644 --- a/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml @@ -23,25 +23,28 @@ 小1 + IsChecked="True" + Theme="{DynamicResource ButtonRadioButton}"> 小2 - + + IsEnabled="False" + Theme="{DynamicResource ButtonRadioButton}"> 小1 + IsEnabled="False" + Theme="{DynamicResource ButtonRadioButton}"> 小2 @@ -51,16 +54,19 @@ 默认1 - 默认2 + 默认2 - + - 默认1 + 默认1 + Theme="{DynamicResource ButtonRadioButton}"> 默认2 @@ -72,25 +78,28 @@ 大1 + IsChecked="True" + Theme="{DynamicResource ButtonRadioButton}"> 大2 - + + IsEnabled="False" + Theme="{DynamicResource ButtonRadioButton}"> 大1 + IsEnabled="False" + Theme="{DynamicResource ButtonRadioButton}"> 大2 @@ -104,7 +113,10 @@ Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 - + 单选框标题 Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 @@ -112,16 +124,19 @@ - + 单选框标题 Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 - 单选框标题 @@ -137,7 +152,10 @@ Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 - + 单选框标题 Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 @@ -145,16 +163,19 @@ - + 单选框标题 Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 单选框标题 diff --git a/src/Semi.Avalonia/Controls/CheckBox.axaml b/src/Semi.Avalonia/Controls/CheckBox.axaml index 5bcbe3c..5818ddf 100644 --- a/src/Semi.Avalonia/Controls/CheckBox.axaml +++ b/src/Semi.Avalonia/Controls/CheckBox.axaml @@ -4,11 +4,11 @@ x:CompileBindings="True"> - - + + + - @@ -17,50 +17,45 @@ - - - - - - - + + + + + + + - - + @@ -178,6 +173,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -461,4 +605,4 @@ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Controls/RadioButton.axaml b/src/Semi.Avalonia/Controls/RadioButton.axaml index 289bfd6..e351271 100644 --- a/src/Semi.Avalonia/Controls/RadioButton.axaml +++ b/src/Semi.Avalonia/Controls/RadioButton.axaml @@ -24,6 +24,10 @@ + + + + + + + 3 diff --git a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml index 394d58b..e766323 100644 --- a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml +++ b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml @@ -32,6 +32,9 @@ + + + 3