From d0b9f2d7c9b030aa1cbaae9fcf31f904e2de9270 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Sun, 16 Mar 2025 17:04:56 +0800
Subject: [PATCH] feat: enhance demo.

---
 .../Converters/FileIconConverter.cs            |  8 ++++----
 .../MainWindow.axaml                           | 18 ++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/demo/Semi.Avalonia.TreeDataGrid.Demo/Converters/FileIconConverter.cs b/demo/Semi.Avalonia.TreeDataGrid.Demo/Converters/FileIconConverter.cs
index 0ed4943..88acb9d 100644
--- a/demo/Semi.Avalonia.TreeDataGrid.Demo/Converters/FileIconConverter.cs
+++ b/demo/Semi.Avalonia.TreeDataGrid.Demo/Converters/FileIconConverter.cs
@@ -3,15 +3,13 @@ using System.Collections.Generic;
 using System.Globalization;
 using Avalonia;
 using Avalonia.Data.Converters;
-using Avalonia.Media;
 using Avalonia.Metadata;
 
 namespace Semi.Avalonia.TreeDataGrid.Demo.Converters;
 
-public class FileIconConverter: IMultiValueConverter
+public class FileIconConverter : IMultiValueConverter
 {
-    [Content] 
-    public Dictionary<string, PathGeometry> Items { get; set; } = new Dictionary<string, PathGeometry>();
+    [Content] public IDictionary<string, object?> Items { get; } = new Dictionary<string, object?>();
 
     public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
     {
@@ -21,8 +19,10 @@ public class FileIconConverter: IMultiValueConverter
             {
                 return Items["file"];
             }
+
             return isOpen ? Items["folderOpen"] : Items["folderClosed"];
         }
+
         return AvaloniaProperty.UnsetValue;
     }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.TreeDataGrid.Demo/MainWindow.axaml b/demo/Semi.Avalonia.TreeDataGrid.Demo/MainWindow.axaml
index 32c5e1d..076f2bd 100644
--- a/demo/Semi.Avalonia.TreeDataGrid.Demo/MainWindow.axaml
+++ b/demo/Semi.Avalonia.TreeDataGrid.Demo/MainWindow.axaml
@@ -13,9 +13,9 @@
     mc:Ignorable="d">
     <Window.Resources>
         <converters:FileIconConverter x:Key="FileIconConverter">
-            <PathGeometry x:Key="file">M14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2M18,20H6V4H13V9H18V20Z</PathGeometry>
-            <PathGeometry x:Key="folderOpen">M6.1,10L4,18V8H21A2,2 0 0,0 19,6H12L10,4H4A2,2 0 0,0 2,6V18A2,2 0 0,0 4,20H19C19.9,20 20.7,19.4 20.9,18.5L23.2,10H6.1M19,18H6L7.6,12H20.6L19,18Z</PathGeometry>
-            <PathGeometry x:Key="folderClosed">M20,18H4V8H20M20,6H12L10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6Z</PathGeometry>
+            <StaticResource x:Key="file" ResourceKey="SemiIconFile" />
+            <StaticResource x:Key="folderOpen" ResourceKey="SemiIconFolderOpen" />
+            <StaticResource x:Key="folderClosed" ResourceKey="SemiIconFolder" />
         </converters:FileIconConverter>
     </Window.Resources>
     <Grid RowDefinitions="Auto, *">
@@ -58,7 +58,7 @@
                     </TreeDataGrid.Resources>
                     <TreeDataGrid.Styles>
                         <Style Selector="TreeDataGrid TreeDataGridRow:nth-last-child(2n)">
-                            <Setter Property="Background" Value="#20808080" />
+                            <Setter Property="Background" Value="{DynamicResource SemiColorFill0}" />
                         </Style>
                     </TreeDataGrid.Styles>
                 </TreeDataGrid>
@@ -86,10 +86,8 @@
                             <DataTemplate x:Key="FileNameCell" DataType="vm:FileNodeViewModel">
                                 <StackPanel Orientation="Horizontal">
                                     <PathIcon
-                                        Width="16"
-                                        Height="16"
-                                        Margin="8,0"
-                                        VerticalAlignment="Center">
+                                        Theme="{StaticResource InnerPathIcon}"
+                                        Margin="8,0">
                                         <PathIcon.Data>
                                             <MultiBinding Converter="{StaticResource FileIconConverter}">
                                                 <Binding Path="IsDirectory" />
@@ -127,7 +125,7 @@
                         </TreeDataGrid.Resources>
                         <TreeDataGrid.Styles>
                             <Style Selector="TreeDataGrid TreeDataGridRow:nth-child(2n)">
-                                <Setter Property="Background" Value="#20808080" />
+                                <Setter Property="Background" Value="{DynamicResource SemiColorFill0}" />
                             </Style>
                         </TreeDataGrid.Styles>
                     </TreeDataGrid>
@@ -135,4 +133,4 @@
             </TabItem>
         </TabControl>
     </Grid>
-</Window>
+</Window>
\ No newline at end of file