diff --git a/src/Avalonia.Styling/Controls/IResourceDictionary.cs b/src/Avalonia.Styling/Controls/IResourceDictionary.cs new file mode 100644 index 0000000000..9891249568 --- /dev/null +++ b/src/Avalonia.Styling/Controls/IResourceDictionary.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections; +using System.Collections.Generic; + +namespace Avalonia.Controls +{ + /// + /// An indexed dictionary of resources. + /// + public interface IResourceDictionary : IDictionary + { + } +} diff --git a/src/Avalonia.Styling/Controls/ResourceDictionary.cs b/src/Avalonia.Styling/Controls/ResourceDictionary.cs index 96f523c83e..125bb0dcdf 100644 --- a/src/Avalonia.Styling/Controls/ResourceDictionary.cs +++ b/src/Avalonia.Styling/Controls/ResourceDictionary.cs @@ -7,7 +7,7 @@ namespace Avalonia.Controls /// /// An indexed dictionary of resources. /// - public class ResourceDictionary : IDictionary, IDictionary + public class ResourceDictionary : IResourceDictionary, IDictionary { private Dictionary _inner = new Dictionary(); diff --git a/src/Avalonia.Styling/Styling/Style.cs b/src/Avalonia.Styling/Styling/Style.cs index d7df465722..637e583a25 100644 --- a/src/Avalonia.Styling/Styling/Style.cs +++ b/src/Avalonia.Styling/Styling/Style.cs @@ -17,7 +17,7 @@ namespace Avalonia.Styling private static Dictionary> _applied = new Dictionary>(); - private ResourceDictionary _resources; + private IResourceDictionary _resources; /// /// Initializes a new instance of the class. @@ -38,7 +38,7 @@ namespace Avalonia.Styling /// /// Gets or sets a dictionary of style resources. /// - public ResourceDictionary Resources + public IResourceDictionary Resources { get { @@ -52,15 +52,12 @@ namespace Avalonia.Styling set { - var resources = Resources; if (!Equals(resources, value)) { foreach (var i in value) { resources[i.Key] = i.Value; - //resources.Add(i.Key, i.Value); - //(resources as IDictionary).Add(i); } } }