diff --git a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
index 38a6db3..ac4c592 100644
--- a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
@@ -4,147 +4,194 @@
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"
- d:DesignHeight="450"
+ xmlns:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
+ d:DesignHeight="1000"
d:DesignWidth="800"
mc:Ignorable="d">
+
+
+
+
+
+ M5 2H19C20.6569 2 22 3.34315 22 5V19C22 20.6569 20.6569 22 19 22H5C3.34315 22 2 20.6569 2 19V5C2 3.34315 3.34315 2 5 2ZM6 4C5.44772 4 5 4.44772 5 5V19C5 19.5523 5.44772 20 6 20H9C9.55229 20 10 19.5523 10 19V5C10 4.44772 9.55229 4 9 4H6Z
+
+
-
-
+
+
+
+
-
+
+
-
+
+
-
-
- Inline
- CompactInline
- Overlay
- CompactOverlay
-
+
+
-
-
- White
- Red
- Blue
- Green
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+ CompactPaneLength="48"
+ OpenPaneLength="256">
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+ Theme="{DynamicResource ButtonToggleSwitch}"
+ IsChecked="{Binding #SplitView.IsPaneOpen}">
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs
index e8a834f..2fb52a5 100644
--- a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs
@@ -1,6 +1,7 @@
-using Avalonia;
+using System.Collections.ObjectModel;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
+using CommunityToolkit.Mvvm.ComponentModel;
namespace Semi.Avalonia.Demo.Pages;
@@ -9,10 +10,35 @@ public partial class SplitViewDemo : UserControl
public SplitViewDemo()
{
InitializeComponent();
+ this.DataContext = new SplitViewDemoViewModel();
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
+}
+
+public class SplitViewDemoViewModel : ObservableObject
+{
+ public ObservableCollection Songs { get; set; } =
+ [
+ "320万年前",
+ "隐德来希",
+ "孔明",
+ "锦鲤卟噜噜",
+ "指鹿为马",
+ "热带季风Remix",
+ "加州梦境",
+ "渐近自由",
+ "世界所有的烂漫",
+ ];
+
+ public ObservableCollection DisplayModes { get; set; } =
+ [
+ SplitViewDisplayMode.Inline,
+ SplitViewDisplayMode.CompactInline,
+ SplitViewDisplayMode.Overlay,
+ SplitViewDisplayMode.CompactOverlay,
+ ];
}
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/ViewModels/DataGridDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/DataGridDemoViewModel.cs
index bb8fa4b..43ecbf0 100644
--- a/demo/Semi.Avalonia.Demo/ViewModels/DataGridDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/DataGridDemoViewModel.cs
@@ -121,7 +121,7 @@ public class Song
new("指鹿为马", "熊猫堂ProducePandas", 3, 12, "W.O.R.L.D.", 74, 2063175272),
new("热带季风Remix", "熊猫堂ProducePandas", 3, 22, "W.O.R.L.D.", 23, 2063173319),
new("加州梦境", "熊猫堂ProducePandas", 2, 56, "W.O.R.L.D.", 1662, 2063173324),
- new("渐进自由", "熊猫堂ProducePandas", 4, 19, "W.O.R.L.D.", 124, 2063173321),
+ new("渐近自由", "熊猫堂ProducePandas", 4, 19, "W.O.R.L.D.", 124, 2063173321),
new("世界所有的烂漫", "熊猫堂ProducePandas", 3, 30, "W.O.R.L.D.", 335, 2053388775),
};
}
diff --git a/src/Package.props b/src/Package.props
index 0212a03..038caf4 100644
--- a/src/Package.props
+++ b/src/Package.props
@@ -2,13 +2,18 @@
net6.0;netstandard2.0
enable
- 11
+ latest
11.0.7.1
- IRIHI Technology
+ IRIHI Technology Co., Ltd.
Avalonia Theme inspired by Semi Design.
https://github.com/irihitech/Semi.Avalonia
+ MIT
+ irihi.png
https://github.com/irihitech/Semi.Avalonia
11.0.7
- MIT
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia.ColorPicker/irihi.png b/src/Semi.Avalonia.ColorPicker/irihi.png
new file mode 100644
index 0000000..01c68d9
Binary files /dev/null and b/src/Semi.Avalonia.ColorPicker/irihi.png differ
diff --git a/src/Semi.Avalonia.DataGrid/irihi.png b/src/Semi.Avalonia.DataGrid/irihi.png
new file mode 100644
index 0000000..01c68d9
Binary files /dev/null and b/src/Semi.Avalonia.DataGrid/irihi.png differ
diff --git a/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj b/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
index 9844f10..76f6dc4 100644
--- a/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
+++ b/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
@@ -3,17 +3,20 @@
net6.0
enable
- 11
+ latest
11.0.1
- IRIHI Technology
+ IRIHI Technology Co., Ltd.
Avalonia Theme inspired by Semi Design.
+ https://github.com/irihitech/Semi.Avalonia
+ MIT
+ irihi.png
https://github.com/irihitech/Semi.Avalonia
11.0.0
- MIT
+
diff --git a/src/Semi.Avalonia.TreeDataGrid/irihi.png b/src/Semi.Avalonia.TreeDataGrid/irihi.png
new file mode 100644
index 0000000..01c68d9
Binary files /dev/null and b/src/Semi.Avalonia.TreeDataGrid/irihi.png differ
diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml
index b59da08..32431ce 100644
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -61,6 +61,7 @@
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+ TextTrimming="CharacterEllipsis"
Foreground="{TemplateBinding Foreground}"
IsVisible="{TemplateBinding SelectionBoxItem,
Converter={x:Static ObjectConverters.IsNull}}"
diff --git a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
index 9f42cbb..706ab9f 100644
--- a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
@@ -131,13 +131,13 @@
-
+
-
+
-
+
-
+
+
+
+
+
diff --git a/src/Semi.Avalonia/Locale/en-us.axaml b/src/Semi.Avalonia/Locale/en-us.axaml
index 82f5da2..75f4ccc 100644
--- a/src/Semi.Avalonia/Locale/en-us.axaml
+++ b/src/Semi.Avalonia/Locale/en-us.axaml
@@ -1,10 +1,16 @@
+
+ Cut
+ Copy
+ Paste
+
File name
Show hidden flies
OK
Cancel
- Cut
- Copy
- Paste
+ Name
+ Date Modified
+ Type
+ Size
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Locale/zh-cn.axaml b/src/Semi.Avalonia/Locale/zh-cn.axaml
index 41968ac..be9980a 100644
--- a/src/Semi.Avalonia/Locale/zh-cn.axaml
+++ b/src/Semi.Avalonia/Locale/zh-cn.axaml
@@ -1,10 +1,16 @@
+
+ 剪切
+ 复制
+ 粘贴
+
文件名
显示隐藏文件
确认
取消
- 剪切
- 复制
- 粘贴
+ 名称
+ 修改日期
+ 类型
+ 大小
\ No newline at end of file
diff --git a/src/Semi.Avalonia/irihi.png b/src/Semi.Avalonia/irihi.png
new file mode 100644
index 0000000..01c68d9
Binary files /dev/null and b/src/Semi.Avalonia/irihi.png differ