Browse Source

Remove TypeInfo usage from Avalonia.Markup.Xaml.

pull/3493/head
Dariusz Komosinski 6 years ago
parent
commit
6d54de504a
  1. 3
      src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
  2. 5
      src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs

3
src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs

@ -2,7 +2,6 @@
// Licensed under the MIT license. See licence.md file in the project root for full license information. // Licensed under the MIT license. See licence.md file in the project root for full license information.
using System; using System;
using System.Reflection;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.Templates; using Avalonia.Controls.Templates;
using Avalonia.Metadata; using Avalonia.Metadata;
@ -28,7 +27,7 @@ namespace Avalonia.Markup.Xaml.Templates
} }
else else
{ {
return DataType.GetTypeInfo().IsAssignableFrom(data.GetType().GetTypeInfo()); return DataType.IsInstanceOfType(data);
} }
} }

5
src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs

@ -2,12 +2,9 @@
// Licensed under the MIT license. See licence.md file in the project root for full license information. // Licensed under the MIT license. See licence.md file in the project root for full license information.
using System; using System;
using System.Reflection;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.Templates; using Avalonia.Controls.Templates;
using Avalonia.Data; using Avalonia.Data;
using Avalonia.Data.Core;
using Avalonia.Markup.Data;
using Avalonia.Markup.Parsers; using Avalonia.Markup.Parsers;
using Avalonia.Metadata; using Avalonia.Metadata;
@ -34,7 +31,7 @@ namespace Avalonia.Markup.Xaml.Templates
} }
else else
{ {
return DataType.GetTypeInfo().IsAssignableFrom(data.GetType().GetTypeInfo()); return DataType.IsInstanceOfType(data);
} }
} }

Loading…
Cancel
Save