Browse Source

remove workaround.

pull/4007/head
Dan Walmsley 6 years ago
parent
commit
98591e7574
  1. 8
      src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs
  2. 7
      src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs

8
src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs

@ -12,8 +12,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
public class ResourceInclude : IResourceProvider
{
private Uri? _baseUri;
private IResourceDictionary? _loaded;
private bool _isLoading;
private IResourceDictionary? _loaded;
/// <summary>
/// Gets the loaded resource dictionary.
@ -22,9 +21,8 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
{
get
{
if (!_isLoading)
{
_isLoading = true;
if (_loaded is null)
{
var loader = new AvaloniaXamlLoader();
_loaded = (IResourceDictionary)loader.Load(Source, _baseUri);
}

7
src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs

@ -13,8 +13,7 @@ namespace Avalonia.Markup.Xaml.Styling
public class StyleInclude : IStyle, IResourceProvider
{
private readonly Uri _baseUri;
private IStyle[]? _loaded;
private bool _isLoading;
private IStyle[]? _loaded;
/// <summary>
/// Initializes a new instance of the <see cref="StyleInclude"/> class.
@ -48,10 +47,8 @@ namespace Avalonia.Markup.Xaml.Styling
{
get
{
if (!_isLoading)
if (_loaded is null)
{
_isLoading = true;
var loader = new AvaloniaXamlLoader();
var loaded = (IStyle)loader.Load(Source, _baseUri);
_loaded = new[] { loaded };

Loading…
Cancel
Save