diff --git a/demo/Semi.Avalonia.Demo/Converters/FileIconConverter.cs b/demo/Semi.Avalonia.Demo/Converters/FileIconConverter.cs deleted file mode 100644 index bdb170d..0000000 --- a/demo/Semi.Avalonia.Demo/Converters/FileIconConverter.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using Avalonia; -using Avalonia.Data.Converters; -using Avalonia.Metadata; - -namespace Semi.Avalonia.Demo.Converters; - -public class FileIconConverter : IMultiValueConverter -{ - [Content] public IDictionary Items { get; } = new Dictionary(); - - public object? Convert(IList values, Type targetType, object? parameter, CultureInfo culture) - { - if (values[0] is bool isDirectory && values[1] is bool isOpen) - { - if (!isDirectory) - { - return Items["file"]; - } - - return isOpen ? Items["folderOpen"] : Items["folderClosed"]; - } - - return AvaloniaProperty.UnsetValue; - } -} \ No newline at end of file diff --git a/demo/Semi.Avalonia.Demo/Pages/WindowCustomizationsPage.axaml b/demo/Semi.Avalonia.Demo/Pages/WindowCustomizationsPage.axaml index 8574778..847dfc0 100644 --- a/demo/Semi.Avalonia.Demo/Pages/WindowCustomizationsPage.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/WindowCustomizationsPage.axaml @@ -3,8 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Semi.Avalonia.Demo.Pages.WindowCustomizationsPage" - x:CompileBindings="True"> + x:Class="Semi.Avalonia.Demo.Pages.WindowCustomizationsPage"> net8.0 enable latest - true diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 2c2797f..9107766 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,6 @@ enable latest - true diff --git a/src/Semi.Avalonia.DataGrid/DataGrid.axaml b/src/Semi.Avalonia.DataGrid/DataGrid.axaml index 9942406..05b91f9 100644 --- a/src/Semi.Avalonia.DataGrid/DataGrid.axaml +++ b/src/Semi.Avalonia.DataGrid/DataGrid.axaml @@ -1,8 +1,7 @@ + xmlns:collections="using:Avalonia.Collections"> diff --git a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml index 4b11fd2..89de02f 100644 --- a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml +++ b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml @@ -1,8 +1,7 @@ + xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls.TreeDataGrid"> diff --git a/src/Semi.Avalonia/Controls/SplitView.axaml b/src/Semi.Avalonia/Controls/SplitView.axaml index 38f09d5..dc2f87e 100644 --- a/src/Semi.Avalonia/Controls/SplitView.axaml +++ b/src/Semi.Avalonia/Controls/SplitView.axaml @@ -1,7 +1,6 @@ + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">