From e1588120f25a5309aaf4a9b6113728e51aca28a8 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 14 Aug 2023 10:49:06 +0800 Subject: [PATCH 01/10] feat: RadioGroupListBox theme. --- .../Pages/ListBoxDemo.axaml | 40 ++-- .../Pages/ListBoxDemo.axaml.cs | 19 +- src/Semi.Avalonia/Controls/ListBox.axaml | 186 +++++++++++++++++- 3 files changed, 224 insertions(+), 21 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml index ef2e0da..97e0876 100644 --- a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml @@ -4,22 +4,30 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:local="clr-namespace:Semi.Avalonia.Demo.Pages" d:DesignHeight="450" d:DesignWidth="800" mc:Ignorable="d"> - - Item 1 - Item 2 - Item 3 - Item 4 - Item 5 - Item 6 - Item 7 - Item 8 - Item 9 - Item 10 - Item 11 - Item 12 - Item 13 - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml.cs index 6d5c3e7..14734e0 100644 --- a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml.cs +++ b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml.cs @@ -1,6 +1,6 @@ -using Avalonia; +using System.Collections; +using System.Collections.Generic; using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Semi.Avalonia.Demo.Pages; @@ -10,4 +10,19 @@ public partial class ListBoxDemo : UserControl { InitializeComponent(); } + + public IEnumerable Items { get; set; } = new List + { + new() { Name = "Ding", IsAvailable = true }, + new() { Name = "Otter", IsAvailable = true }, + new() { Name = "Husky", IsAvailable = false }, + new() { Name = "Mr.17", IsAvailable = true }, + new() { Name = "Cass", IsAvailable = true }, + }; +} + +internal record Panda +{ + public string Name { get; set; } + public bool IsAvailable { get; set; } } \ No newline at end of file diff --git a/src/Semi.Avalonia/Controls/ListBox.axaml b/src/Semi.Avalonia/Controls/ListBox.axaml index f07d864..5ba9a52 100644 --- a/src/Semi.Avalonia/Controls/ListBox.axaml +++ b/src/Semi.Avalonia/Controls/ListBox.axaml @@ -66,7 +66,8 @@ @@ -84,8 +85,187 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From a6fe50e6bc47a3ca34b9adf6dc3515d7c80e211c Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 14 Aug 2023 11:17:07 +0800 Subject: [PATCH 02/10] feat: transform style resources. --- src/Semi.Avalonia/Controls/ListBox.axaml | 68 +++++++++---------- src/Semi.Avalonia/Themes/Dark/ListBox.axaml | 49 +++++++++++++ src/Semi.Avalonia/Themes/Light/ListBox.axaml | 50 ++++++++++++++ src/Semi.Avalonia/Themes/Shared/ListBox.axaml | 25 +++++++ 4 files changed, 158 insertions(+), 34 deletions(-) diff --git a/src/Semi.Avalonia/Controls/ListBox.axaml b/src/Semi.Avalonia/Controls/ListBox.axaml index 5ba9a52..cc06cc2 100644 --- a/src/Semi.Avalonia/Controls/ListBox.axaml +++ b/src/Semi.Avalonia/Controls/ListBox.axaml @@ -120,11 +120,11 @@ - - - - - + + + + + - @@ -167,8 +167,8 @@ ContentTemplate="{TemplateBinding ContentTemplate}" Foreground="{TemplateBinding Foreground}" RecognizesAccessKey="True" - TextElement.FontSize="{DynamicResource RadioButtonFontSize}" - TextElement.Foreground="{DynamicResource RadioButtonForeground}" /> + TextElement.FontSize="{DynamicResource ListBoxItemRadioGroupFontSize}" + TextElement.Foreground="{DynamicResource ListBoxItemRadioGroupForeground}" /> @@ -178,8 +178,8 @@ diff --git a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml index 15a5cc8..f30abc8 100644 --- a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml @@ -11,4 +11,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/ListBox.axaml b/src/Semi.Avalonia/Themes/Light/ListBox.axaml index 8dbf5be..038ed4a 100644 --- a/src/Semi.Avalonia/Themes/Light/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Light/ListBox.axaml @@ -11,4 +11,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml index c920a66..8cb6391 100644 --- a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml @@ -1,4 +1,29 @@ 8 4 3 + + 16 + 6 + 14 + 0 2 8 0 + + + 3 + + 3 + 3 + + 600 + 16 2 + 16 4 + 24 6 + + 12 + 12 + 14 + + 16 12 + + 3 + \ No newline at end of file From eef4e5b62a77a716947f5b7dc569ad0a6dcb477d Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 14 Aug 2023 16:50:50 +0800 Subject: [PATCH 03/10] feat: ButtonRadioGroupListBox, CardRadioGroupListBox, PureCardRadioGroupListBox. --- .../Pages/ListBoxDemo.axaml | 14 + src/Semi.Avalonia/Controls/ListBox.axaml | 322 +++++++++++++++++- 2 files changed, 329 insertions(+), 7 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml index 97e0876..36593e1 100644 --- a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml @@ -28,6 +28,20 @@ ItemTemplate="{StaticResource PandaTemplate}" ItemContainerTheme="{StaticResource PandaControlTheme}"> + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Controls/ListBox.axaml b/src/Semi.Avalonia/Controls/ListBox.axaml index cc06cc2..955c455 100644 --- a/src/Semi.Avalonia/Controls/ListBox.axaml +++ b/src/Semi.Avalonia/Controls/ListBox.axaml @@ -11,6 +11,7 @@ Item 4 + @@ -39,7 +40,6 @@ - @@ -113,7 +113,6 @@ - @@ -188,7 +187,8 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 8a51f98532d577e783e079634c013eabf8bf53ff Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 14 Aug 2023 17:05:52 +0800 Subject: [PATCH 04/10] feat: separate resource dictionary. --- src/Semi.Avalonia/Controls/ListBox.axaml | 158 ++++++++++-------- src/Semi.Avalonia/Themes/Dark/ListBox.axaml | 11 +- src/Semi.Avalonia/Themes/Light/ListBox.axaml | 10 +- src/Semi.Avalonia/Themes/Shared/ListBox.axaml | 9 +- 4 files changed, 101 insertions(+), 87 deletions(-) diff --git a/src/Semi.Avalonia/Controls/ListBox.axaml b/src/Semi.Avalonia/Controls/ListBox.axaml index 955c455..eb1c353 100644 --- a/src/Semi.Avalonia/Controls/ListBox.axaml +++ b/src/Semi.Avalonia/Controls/ListBox.axaml @@ -280,14 +280,15 @@ - + - - - - + + + + @@ -342,16 +345,16 @@ - + - + - - + + - + @@ -395,8 +398,8 @@ ContentTemplate="{TemplateBinding ContentTemplate}" Foreground="{TemplateBinding Foreground}" RecognizesAccessKey="True" - TextElement.FontSize="{DynamicResource RadioButtonFontSize}" - TextElement.Foreground="{DynamicResource RadioButtonForeground}" /> + TextElement.FontSize="{DynamicResource ListBoxItemRadioGroupFontSize}" + TextElement.Foreground="{DynamicResource ListBoxItemRadioGroupForeground}" /> @@ -404,8 +407,8 @@ @@ -518,13 +531,13 @@ - + - - - + + + - + diff --git a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml index f30abc8..a06e53b 100644 --- a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml @@ -1,4 +1,5 @@ + @@ -11,8 +12,9 @@ + - + @@ -40,9 +42,7 @@ - - - + @@ -50,14 +50,13 @@ + - - \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/ListBox.axaml b/src/Semi.Avalonia/Themes/Light/ListBox.axaml index 038ed4a..080871e 100644 --- a/src/Semi.Avalonia/Themes/Light/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Light/ListBox.axaml @@ -1,4 +1,5 @@ + @@ -11,6 +12,7 @@ + @@ -40,9 +42,7 @@ - - - + @@ -50,15 +50,13 @@ - + - - \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml index 8cb6391..8ef49a9 100644 --- a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml @@ -1,16 +1,16 @@ + 8 4 3 + 16 6 14 0 2 8 0 - - 3 - 3 + 3 600 @@ -22,8 +22,7 @@ 12 14 + 16 12 - 3 - \ No newline at end of file From a1e17b0e199d0a37dc9857858fc6dcaa54743cc8 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 14 Aug 2023 17:25:40 +0800 Subject: [PATCH 05/10] feat: description. --- src/Semi.Avalonia/Themes/Dark/RadioButton.axaml | 7 +++---- src/Semi.Avalonia/Themes/Light/RadioButton.axaml | 8 +++----- src/Semi.Avalonia/Themes/Shared/RadioButton.axaml | 5 +++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml index f0a77ac..d4f2811 100644 --- a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml @@ -1,4 +1,5 @@ + @@ -20,7 +21,6 @@ - @@ -29,7 +29,7 @@ - + @@ -37,14 +37,13 @@ + - - \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml index 97225ac..935597a 100644 --- a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml +++ b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml @@ -1,4 +1,5 @@ + @@ -20,7 +21,6 @@ - @@ -29,7 +29,7 @@ - + @@ -37,15 +37,13 @@ - + - - \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml b/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml index df34b02..e3cefaa 100644 --- a/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml +++ b/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml @@ -1,10 +1,11 @@ + 16 6 14 0 2 8 0 - + 3 3 @@ -19,7 +20,7 @@ 12 14 + 16 12 - 3 \ No newline at end of file From 430a7e56ca6923c16561bf5c0d5243b9f2d2da30 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 14 Aug 2023 18:49:33 +0800 Subject: [PATCH 06/10] feat: ListBox demo. --- .../Pages/ListBoxDemo.axaml | 131 +++++++++++++----- .../Pages/ListBoxDemo.axaml.cs | 15 +- 2 files changed, 98 insertions(+), 48 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml index 36593e1..87af391 100644 --- a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml @@ -8,40 +8,103 @@ d:DesignHeight="450" d:DesignWidth="800" mc:Ignorable="d"> - - - - - - - - - - - - - - - - - - - - - + + + + + + + Avalonia + WPF + + + + + + + + + + Avalonia + WPF + + + + + + Small 1 + Small 2 + + + + + Small 1 + Small 2 + + + + + + + Default 1 + Default 2 + + + + + Default 1 + Default 2 + + + + + + + Small 1 + Small 2 + + + + + Small 1 + Small 2 + + + + + + + Avalonia + WPF + + + + + Avalonia + WPF + + + + \ No newline at end of file diff --git a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml.cs index 14734e0..2eb3e7d 100644 --- a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml.cs +++ b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml.cs @@ -11,18 +11,5 @@ public partial class ListBoxDemo : UserControl InitializeComponent(); } - public IEnumerable Items { get; set; } = new List - { - new() { Name = "Ding", IsAvailable = true }, - new() { Name = "Otter", IsAvailable = true }, - new() { Name = "Husky", IsAvailable = false }, - new() { Name = "Mr.17", IsAvailable = true }, - new() { Name = "Cass", IsAvailable = true }, - }; -} - -internal record Panda -{ - public string Name { get; set; } - public bool IsAvailable { get; set; } + public IEnumerable Items { get; set; } = new List { "Ding", "Otter", "Husky", "Mr.17", "Cass", }; } \ No newline at end of file From 6a4065f3b77a560dbe25f8176b191afb27cd94a6 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Wed, 16 Aug 2023 18:02:27 +0800 Subject: [PATCH 07/10] feat: CheckGroup. --- .../Pages/ListBoxDemo.axaml | 47 +- src/Semi.Avalonia/Controls/ListBox.axaml | 402 ++++++++++++++++++ 2 files changed, 448 insertions(+), 1 deletion(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml index 87af391..7eda663 100644 --- a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml @@ -8,8 +8,13 @@ d:DesignHeight="450" d:DesignWidth="800" mc:Ignorable="d"> + + + - + + + + + + + + Avalonia + WPF + + + + Avalonia + WPF + + + + Avalonia + WPF + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Controls/ListBox.axaml b/src/Semi.Avalonia/Controls/ListBox.axaml index eb1c353..c4451a3 100644 --- a/src/Semi.Avalonia/Controls/ListBox.axaml +++ b/src/Semi.Avalonia/Controls/ListBox.axaml @@ -91,6 +91,7 @@ + @@ -594,4 +595,405 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 29dce1de5152d08f74a654a7e008b1a1f24a4363 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Wed, 16 Aug 2023 20:50:51 +0800 Subject: [PATCH 08/10] feat: transform style resources. --- src/Semi.Avalonia/Controls/ListBox.axaml | 195 +++++++++--------- src/Semi.Avalonia/Themes/Dark/ListBox.axaml | 35 ++++ src/Semi.Avalonia/Themes/Light/ListBox.axaml | 35 ++++ src/Semi.Avalonia/Themes/Shared/ListBox.axaml | 18 ++ 4 files changed, 191 insertions(+), 92 deletions(-) diff --git a/src/Semi.Avalonia/Controls/ListBox.axaml b/src/Semi.Avalonia/Controls/ListBox.axaml index c4451a3..d7634af 100644 --- a/src/Semi.Avalonia/Controls/ListBox.axaml +++ b/src/Semi.Avalonia/Controls/ListBox.axaml @@ -610,12 +610,12 @@ - - + + - - - + + + + Width="{DynamicResource ListBoxItemCheckBoxGlyphWidth}" + Height="{DynamicResource ListBoxItemCheckBoxGlyphHeight}" + Foreground="{DynamicResource ListBoxItemCheckGlyphFill}" /> @@ -783,11 +787,11 @@ - - - + + + - + + Width="{DynamicResource ListBoxItemCheckBoxGlyphWidth}" + Height="{DynamicResource ListBoxItemCheckBoxGlyphHeight}" + Foreground="{DynamicResource ListBoxItemCheckGlyphFill}" /> @@ -929,12 +938,12 @@ - - - - + + + + - + diff --git a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml index a06e53b..eabaf20 100644 --- a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml @@ -59,4 +59,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/ListBox.axaml b/src/Semi.Avalonia/Themes/Light/ListBox.axaml index 080871e..553ad5f 100644 --- a/src/Semi.Avalonia/Themes/Light/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Light/ListBox.axaml @@ -59,4 +59,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml index 8ef49a9..4a86ea2 100644 --- a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml @@ -25,4 +25,22 @@ 16 12 3 + + + 14 + 16 + 16 + 10 + 10 + + 3 + 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 \ No newline at end of file From a2927266b43cde6c9d5ed1fecb342b9451799772 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Wed, 16 Aug 2023 21:04:30 +0800 Subject: [PATCH 09/10] feat: description. --- .../Pages/ListBoxDemo.axaml | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml index 7eda663..bd7442f 100644 --- a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml @@ -5,14 +5,9 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Semi.Avalonia.Demo.Pages" - d:DesignHeight="450" + d:DesignHeight="900" d:DesignWidth="800" mc:Ignorable="d"> - - - + Avalonia @@ -35,14 +31,16 @@ Theme="{DynamicResource GroupBox}" Header="RadioGroupListBox"> + - Avalonia - WPF + Avalonia + WPF + @@ -95,6 +93,7 @@ + @@ -102,11 +101,12 @@ WPF + - Avalonia - WPF + Avalonia + WPF @@ -117,6 +117,7 @@ Header="CheckGroupListBox"> + Avalonia WPF + + - Avalonia - WPF + Avalonia + WPF + + Date: Wed, 16 Aug 2023 23:28:16 +0800 Subject: [PATCH 10/10] feat: remove PureCardCheckGroupListBox because of duplication. --- .../Pages/ListBoxDemo.axaml | 12 --- src/Semi.Avalonia/Controls/ListBox.axaml | 77 ------------------- 2 files changed, 89 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml index bd7442f..ef6059e 100644 --- a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml @@ -140,18 +140,6 @@ Avalonia WPF - - - - - Avalonia - WPF - diff --git a/src/Semi.Avalonia/Controls/ListBox.axaml b/src/Semi.Avalonia/Controls/ListBox.axaml index d7634af..cb0be3e 100644 --- a/src/Semi.Avalonia/Controls/ListBox.axaml +++ b/src/Semi.Avalonia/Controls/ListBox.axaml @@ -930,81 +930,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file