From 975d14a36f8edce043036b43b31b19a8c1fb290b Mon Sep 17 00:00:00 2001 From: rabbitism Date: Sat, 4 Oct 2025 10:48:38 +0800 Subject: [PATCH 1/5] feat: upgrade to 11.3.7, implement splitview changes. --- demo/Directory.Build.props | 4 +- .../Pages/SplitViewDemo.axaml | 355 +++++++----------- .../ViewModels/SplitViewDemoViewModel.cs | 8 + src/Package.props | 2 +- src/Semi.Avalonia/Controls/SplitView.axaml | 261 ++++++++++++- 5 files changed, 402 insertions(+), 228 deletions(-) diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props index 9b0eef8..a89d1ff 100644 --- a/demo/Directory.Build.props +++ b/demo/Directory.Build.props @@ -1,7 +1,7 @@ - 11.3.0 - 11.3.0 + 11.3.7 + 11.3.7 8.4.0 diff --git a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml index bd8fb68..ce8424a 100644 --- a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml @@ -7,277 +7,186 @@ xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels" d:DesignHeight="1000" d:DesignWidth="800" - mc:Ignorable="d" - x:DataType="vm:SplitViewDemoViewModel"> + x:DataType="vm:SplitViewDemoViewModel" + mc:Ignorable="d"> - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/demo/Semi.Avalonia.Demo/ViewModels/SplitViewDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/SplitViewDemoViewModel.cs index a351142..4709201 100644 --- a/demo/Semi.Avalonia.Demo/ViewModels/SplitViewDemoViewModel.cs +++ b/demo/Semi.Avalonia.Demo/ViewModels/SplitViewDemoViewModel.cs @@ -26,4 +26,12 @@ public class SplitViewDemoViewModel : ObservableObject SplitViewDisplayMode.Overlay, SplitViewDisplayMode.CompactOverlay, ]; + + public static ObservableCollection Placements { get; set; } = + [ + SplitViewPanePlacement.Left, + SplitViewPanePlacement.Right, + SplitViewPanePlacement.Top, + SplitViewPanePlacement.Bottom + ]; } \ No newline at end of file diff --git a/src/Package.props b/src/Package.props index d4e1d35..ddfa884 100644 --- a/src/Package.props +++ b/src/Package.props @@ -10,7 +10,7 @@ MIT irihi.png https://github.com/irihitech/Semi.Avalonia - 11.2.1 + 11.3.7 true diff --git a/src/Semi.Avalonia/Controls/SplitView.axaml b/src/Semi.Avalonia/Controls/SplitView.axaml index def5fc9..198bad8 100644 --- a/src/Semi.Avalonia/Controls/SplitView.axaml +++ b/src/Semi.Avalonia/Controls/SplitView.axaml @@ -184,9 +184,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 47c6899b94a899aade73a9270098b538138d1d35 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Sat, 4 Oct 2025 10:58:32 +0800 Subject: [PATCH 2/5] fix: fix copilot comments. --- src/Semi.Avalonia/Controls/SplitView.axaml | 85 ++++++++-------------- 1 file changed, 32 insertions(+), 53 deletions(-) diff --git a/src/Semi.Avalonia/Controls/SplitView.axaml b/src/Semi.Avalonia/Controls/SplitView.axaml index 198bad8..05e31a8 100644 --- a/src/Semi.Avalonia/Controls/SplitView.axaml +++ b/src/Semi.Avalonia/Controls/SplitView.axaml @@ -1,6 +1,4 @@ - + @@ -100,7 +98,7 @@ - + @@ -245,8 +241,7 @@ @@ -338,8 +332,7 @@ - - + + @@ -513,8 +504,7 @@ - + @@ -552,8 +542,7 @@ @@ -567,8 +556,7 @@ @@ -660,8 +644,7 @@ - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + - - - - - - - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml index 73958ca..fe2d055 100644 --- a/src/Semi.Avalonia/Controls/ComboBox.axaml +++ b/src/Semi.Avalonia/Controls/ComboBox.axaml @@ -66,8 +66,14 @@ VerticalAlignment="{TemplateBinding VerticalContentAlignment}" TextTrimming="CharacterEllipsis" Foreground="{TemplateBinding PlaceholderForeground}" - IsVisible="{TemplateBinding SelectionBoxItem,Converter={x:Static ObjectConverters.IsNull}}" - Text="{TemplateBinding PlaceholderText}" /> + Text="{TemplateBinding PlaceholderText}"> + + + + + + + + ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" + IsVisible="{TemplateBinding IsEditable, Converter={x:Static BoolConverters.Not}}" /> + +