Browse Source

Allow to use object as a resource key in Static/DynamicResourceExtension

pull/3024/head
Miłosz Kukla 7 years ago
parent
commit
5b15fe4b41
  1. 2
      src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
  2. 4
      src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs

2
src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs

@ -18,7 +18,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
{ {
} }
public DynamicResourceExtension(string resourceKey) public DynamicResourceExtension(object resourceKey)
{ {
ResourceKey = resourceKey; ResourceKey = resourceKey;
} }

4
src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs

@ -16,12 +16,12 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
{ {
} }
public StaticResourceExtension(string resourceKey) public StaticResourceExtension(object resourceKey)
{ {
ResourceKey = resourceKey; ResourceKey = resourceKey;
} }
public string ResourceKey { get; set; } public object ResourceKey { get; set; }
public object ProvideValue(IServiceProvider serviceProvider) public object ProvideValue(IServiceProvider serviceProvider)
{ {

Loading…
Cancel
Save