From afb0fbcea61992ad0ad2f2f0c5e577c542d642db Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 27 Mar 2023 15:31:26 +0800 Subject: [PATCH 01/15] feat: add CheckBox and RadioButton overview. --- demo/Semi.Avalonia.Demo/Pages/Overview.axaml | 79 ++++++++++++++++++-- 1 file changed, 73 insertions(+), 6 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml index a236e88..ee2d21c 100644 --- a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml @@ -62,12 +62,79 @@ Description 2 + + + Option 1 + Description 1 + + + + + Option 2 + Description 2 + + - - Avalonia - WPF - UWP + + Avalonia + WPF + UWP + + + + + Option 1 + Description 1 + + + + + Option 2 + Description 2 + + + + + Option 3 + Description 3 + + + + + Option 1 + Description 1 + + + + + Option 2 + Description 2 + + + + + Option 3 + Description 3 + + - + Item 1 Item 2 Item 3 @@ -157,4 +224,4 @@ - + \ No newline at end of file From a015bbe3e0de10db03d4870652cf6c93f166b413 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 27 Mar 2023 15:35:43 +0800 Subject: [PATCH 02/15] fix: split buttons. --- demo/Semi.Avalonia.Demo/Pages/Overview.axaml | 169 ++++++++++--------- 1 file changed, 88 insertions(+), 81 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml index ee2d21c..c8a0fac 100644 --- a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml @@ -47,36 +47,40 @@ 选项 2 - - - Option 1 - Description 1 - - - - - Option 2 - Description 2 - - - - - Option 1 - Description 1 - - - - - Option 2 - Description 2 - - + + + + Option 1 + Description 1 + + + + + Option 2 + Description 2 + + + + + + + Option 1 + Description 1 + + + + + Option 2 + Description 2 + + + @@ -84,57 +88,60 @@ WPF UWP - - - - Option 1 - Description 1 - - - - - Option 2 - Description 2 - - - - - Option 3 - Description 3 - - - - - Option 1 - Description 1 - - - - - Option 2 - Description 2 - - - - - Option 3 - Description 3 - - + + + + Option 1 + Description 1 + + + + + Option 2 + Description 2 + + + + + Option 3 + Description 3 + + + + + + + Option 1 + Description 1 + + + + + Option 2 + Description 2 + + + + + Option 3 + Description 3 + + + Date: Mon, 27 Mar 2023 16:00:27 +0800 Subject: [PATCH 03/15] feat: relayout CheckBoxDemo. --- .../Pages/CheckBoxDemo.axaml | 82 ++++++++++--------- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml index 7adda8c..b7ef18f 100644 --- a/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml @@ -8,21 +8,26 @@ d:DesignWidth="800" mc:Ignorable="d"> - - Unchecked - Unchecked - Checked - Checked - Indeterminate - - Indeterminate - + + + + Unchecked + Checked + Indeterminate + + + Unchecked + Checked + + Indeterminate + + Checkbox should wrap its text - + 复选框标题 @@ -38,6 +43,18 @@ Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + 复选框标题 + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 - - - 复选框标题 - Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 - - - + 复选框标题 @@ -97,6 +103,19 @@ Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + 复选框标题 + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 + + + + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 - - - 复选框标题 - Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 - - - + \ No newline at end of file From cc2ab6ee9a1a3284ed792dfb16c7fdc08156347d Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 27 Mar 2023 16:08:58 +0800 Subject: [PATCH 04/15] feat: relayout RadioButtonDemo. --- .../Pages/RadioButtonDemo.axaml | 155 +++++++++++------- 1 file changed, 92 insertions(+), 63 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml index e93efa0..93b4391 100644 --- a/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml @@ -5,73 +5,102 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> - - - - 111 - 222 - 333 - - - + + + - 小1 - 小2 + Unchecked + Checked - - - 默认1 - 默认2 + Unchecked + Checked - - + + + + 小1 + 小2 + + + + + 默认1 + 默认2 + + + + + 大1 + 大2 + + + - 大1 - 大2 + + + 单选框标题 + 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 团队共同设计开发并维护的设计系统 - - - - - 单选框标题 - Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 - - - - - 单选框标题 - Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统 - - - - - + + \ No newline at end of file From a4713ca21b7f8cb010547bb9a90c29c9a847c192 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 27 Mar 2023 17:21:56 +0800 Subject: [PATCH 05/15] feat: original RadioButton disabled style. --- src/Semi.Avalonia/Controls/RadioButton.axaml | 6 ++++++ src/Semi.Avalonia/Themes/Dark/RadioButton.axaml | 1 + src/Semi.Avalonia/Themes/Light/RadioButton.axaml | 1 + 3 files changed, 8 insertions(+) diff --git a/src/Semi.Avalonia/Controls/RadioButton.axaml b/src/Semi.Avalonia/Controls/RadioButton.axaml index cb08a64..413f8d8 100644 --- a/src/Semi.Avalonia/Controls/RadioButton.axaml +++ b/src/Semi.Avalonia/Controls/RadioButton.axaml @@ -88,6 +88,9 @@ + + + - - - - - - - - - + - + - + - + + - + + + - - + - + + + + + + + From f63abf6901a11c0cd28c5750501dae9a1b03c668 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 27 Mar 2023 18:54:35 +0800 Subject: [PATCH 08/15] mix: format Card pseudoclass styles. --- src/Semi.Avalonia/Controls/CheckBox.axaml | 1 - src/Semi.Avalonia/Controls/RadioButton.axaml | 124 +++++++++++-------- 2 files changed, 73 insertions(+), 52 deletions(-) diff --git a/src/Semi.Avalonia/Controls/CheckBox.axaml b/src/Semi.Avalonia/Controls/CheckBox.axaml index c4df0f3..38ba68d 100644 --- a/src/Semi.Avalonia/Controls/CheckBox.axaml +++ b/src/Semi.Avalonia/Controls/CheckBox.axaml @@ -446,7 +446,6 @@ diff --git a/src/Semi.Avalonia/Controls/RadioButton.axaml b/src/Semi.Avalonia/Controls/RadioButton.axaml index 02fb5af..35da05e 100644 --- a/src/Semi.Avalonia/Controls/RadioButton.axaml +++ b/src/Semi.Avalonia/Controls/RadioButton.axaml @@ -274,7 +274,51 @@ - + + + + + + + + + + + + + + + + + + + + + - - - + + + + - - - - - - - - - @@ -385,23 +403,27 @@ UseLayoutRounding="False" /> + + + - - - From e79044b040ddb916491916c7ab32d61e817b5911 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 27 Mar 2023 19:20:17 +0800 Subject: [PATCH 09/15] feat: ButtonRadioButton demo. --- .../Pages/RadioButtonDemo.axaml | 97 +++++++++++++++---- 1 file changed, 79 insertions(+), 18 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml index 93b4391..59814fc 100644 --- a/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml @@ -17,24 +17,85 @@ Checked - - - 小1 - 小2 - - - - - 默认1 - 默认2 - - - - - 大1 - 大2 - - + + + + 小1 + + 小2 + + + + + + + 小1 + + + 小2 + + + + + + + + 默认1 + 默认2 + + + + + 默认1 + + 默认2 + + + + + + + + 大1 + + 大2 + + + + + + + 大1 + + + 大2 + + + + From 3124c5e2cc11e94d083159d224ff3889d9c046e8 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 27 Mar 2023 19:43:11 +0800 Subject: [PATCH 10/15] feat: disabled ButtonRadioButton style. --- src/Semi.Avalonia/Controls/RadioButton.axaml | 11 +++++++---- src/Semi.Avalonia/Themes/Dark/RadioButton.axaml | 5 +++-- src/Semi.Avalonia/Themes/Light/RadioButton.axaml | 5 +++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/Semi.Avalonia/Controls/RadioButton.axaml b/src/Semi.Avalonia/Controls/RadioButton.axaml index 35da05e..55e5971 100644 --- a/src/Semi.Avalonia/Controls/RadioButton.axaml +++ b/src/Semi.Avalonia/Controls/RadioButton.axaml @@ -195,15 +195,18 @@ UseLayoutRounding="False" /> - + + + + + From 31ba4c9fbeca764f51854b1aabaa64b73fec1841 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Mon, 27 Mar 2023 23:32:24 +0800 Subject: [PATCH 13/15] fix: fix card disabled style. --- src/Semi.Avalonia/Controls/RadioButton.axaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Semi.Avalonia/Controls/RadioButton.axaml b/src/Semi.Avalonia/Controls/RadioButton.axaml index cb7c590..27bdfaf 100644 --- a/src/Semi.Avalonia/Controls/RadioButton.axaml +++ b/src/Semi.Avalonia/Controls/RadioButton.axaml @@ -321,6 +321,9 @@ + @@ -377,6 +380,9 @@ + From 7a89d503d7e140a618113e26d53e2f6e400fa7f0 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Mon, 27 Mar 2023 23:35:33 +0800 Subject: [PATCH 14/15] fix: add more fix. --- src/Semi.Avalonia/Controls/RadioButton.axaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Semi.Avalonia/Controls/RadioButton.axaml b/src/Semi.Avalonia/Controls/RadioButton.axaml index 27bdfaf..c827ef6 100644 --- a/src/Semi.Avalonia/Controls/RadioButton.axaml +++ b/src/Semi.Avalonia/Controls/RadioButton.axaml @@ -423,6 +423,11 @@ + +