Browse Source

IResourceHost -> IResourceProvider.

pull/1136/head
Steven Kirk 9 years ago
parent
commit
d1fee611bf
  1. 4
      src/Avalonia.Controls/Application.cs
  2. 2
      src/Avalonia.Controls/Control.cs
  3. 2
      src/Avalonia.Controls/ControlExtensions.cs
  4. 2
      src/Avalonia.Controls/IControl.cs
  5. 2
      src/Avalonia.Styling/Controls/IResourceProvider.cs
  6. 2
      src/Avalonia.Styling/Styling/IStyle.cs
  7. 2
      tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs

4
src/Avalonia.Controls/Application.cs

@ -29,7 +29,7 @@ namespace Avalonia
/// method.
/// - Tracks the lifetime of the application.
/// </remarks>
public class Application : IApplicationLifecycle, IGlobalDataTemplates, IGlobalStyles, IStyleRoot, IResourceHost
public class Application : IApplicationLifecycle, IGlobalDataTemplates, IGlobalStyles, IStyleRoot, IResourceProvider
{
/// <summary>
/// The application-global data templates.
@ -150,7 +150,7 @@ namespace Avalonia
}
/// <inheritdoc/>
bool IResourceHost.TryGetResource(string key, out object value)
bool IResourceProvider.TryGetResource(string key, out object value)
{
value = null;
return _resources?.TryGetResource(key, out value) ??

2
src/Avalonia.Controls/Control.cs

@ -425,7 +425,7 @@ namespace Avalonia.Controls
protected IPseudoClasses PseudoClasses => Classes;
/// <inheritdoc/>
bool IResourceHost.TryGetResource(string key, out object value)
bool IResourceProvider.TryGetResource(string key, out object value)
{
value = null;
return _resources?.TryGetResource(key, out value) ??

2
src/Avalonia.Controls/ControlExtensions.cs

@ -96,7 +96,7 @@ namespace Avalonia.Controls
while (current != null)
{
if (current is IResourceHost host)
if (current is IResourceProvider host)
{
if (host.TryGetResource(key, out var value))
{

2
src/Avalonia.Controls/IControl.cs

@ -14,7 +14,7 @@ namespace Avalonia.Controls
/// <summary>
/// Interface for Avalonia controls.
/// </summary>
public interface IControl : IVisual, ILogical, ILayoutable, IInputElement, INamed, IResourceHost, IStyleable, IStyleHost
public interface IControl : IVisual, ILogical, ILayoutable, IInputElement, INamed, IResourceProvider, IStyleable, IStyleHost
{
/// <summary>
/// Occurs when the control has finished initialization.

2
src/Avalonia.Styling/Controls/IResourceHost.cs → src/Avalonia.Styling/Controls/IResourceProvider.cs

@ -5,7 +5,7 @@ namespace Avalonia.Controls
/// <summary>
/// Defines an element that can be queried for resources.
/// </summary>
public interface IResourceHost
public interface IResourceProvider
{
/// <summary>
/// Tries to find a resource within the element.

2
src/Avalonia.Styling/Styling/IStyle.cs

@ -8,7 +8,7 @@ namespace Avalonia.Styling
/// <summary>
/// Defines the interface for styles.
/// </summary>
public interface IStyle : IResourceHost
public interface IStyle : IResourceProvider
{
/// <summary>
/// Attaches the style to a control if the style's selector matches.

2
tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs

@ -162,7 +162,7 @@ namespace Avalonia.Layout.UnitTests
private void RegisterServices()
{
var globalStyles = new Mock<IGlobalStyles>();
var globalStylesResources = globalStyles.As<IResourceHost>();
var globalStylesResources = globalStyles.As<IResourceProvider>();
var outObj = (object)10;
globalStylesResources.Setup(x => x.TryGetResource("FontSizeNormal", out outObj)).Returns(true);

Loading…
Cancel
Save