Matthijs ter Woord
9 years ago
committed by
GitHub
GitHub
130 changed files with 3536 additions and 868 deletions
@ -1,6 +1,7 @@ |
|||||
<ProjectConfiguration> |
<ProjectConfiguration> |
||||
<Settings> |
<Settings> |
||||
<DefaultTestTimeout>1000</DefaultTestTimeout> |
<DefaultTestTimeout>1000</DefaultTestTimeout> |
||||
|
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely> |
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully> |
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully> |
||||
</Settings> |
</Settings> |
||||
</ProjectConfiguration> |
</ProjectConfiguration> |
||||
@ -0,0 +1,9 @@ |
|||||
|
<ProjectConfiguration> |
||||
|
<Settings> |
||||
|
<IgnoredTests> |
||||
|
<NamedTestSelector> |
||||
|
<TestName>Avalonia.Markup.UnitTests.Data.Plugins.DataAnnotationsValidationPluginTests.Produces_Aggregate_BindingNotificationsx</TestName> |
||||
|
</NamedTestSelector> |
||||
|
</IgnoredTests> |
||||
|
</Settings> |
||||
|
</ProjectConfiguration> |
||||
@ -1,6 +1,7 @@ |
|||||
<ProjectConfiguration> |
<ProjectConfiguration> |
||||
<Settings> |
<Settings> |
||||
<DefaultTestTimeout>1000</DefaultTestTimeout> |
<DefaultTestTimeout>1000</DefaultTestTimeout> |
||||
|
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely> |
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully> |
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully> |
||||
</Settings> |
</Settings> |
||||
</ProjectConfiguration> |
</ProjectConfiguration> |
||||
@ -0,0 +1,5 @@ |
|||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
||||
|
<ItemGroup> |
||||
|
<PackageReference Include="reactiveui" Version="8.0.0-alpha0073" /> |
||||
|
</ItemGroup> |
||||
|
</Project> |
||||
@ -1,11 +1,10 @@ |
|||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
||||
<ItemGroup> |
<ItemGroup> |
||||
<PackageReference Include="System.Reactive" Version="3.0.0" /> |
<PackageReference Include="System.Reactive" Version="3.1.1" /> |
||||
<PackageReference Include="System.Reactive.Core" Version="3.0.0" /> |
<PackageReference Include="System.Reactive.Core" Version="3.1.1" /> |
||||
<PackageReference Include="System.Reactive.Interfaces" Version="3.0.0" /> |
<PackageReference Include="System.Reactive.Interfaces" Version="3.1.1" /> |
||||
<PackageReference Include="System.Reactive.Linq" Version="3.0.0" /> |
<PackageReference Include="System.Reactive.Linq" Version="3.1.1" /> |
||||
<PackageReference Include="System.Reactive.PlatformServices" Version="3.0.0" /> |
<PackageReference Include="System.Reactive.PlatformServices" Version="3.1.1" /> |
||||
<PackageReference Condition="'$(TargetFramework)' == 'net45'" Include="System.Reactive.Windows.Threading" Version="3.0.0" /> |
<PackageReference Condition="$(TargetFramework.StartsWith('net4'))" Include="System.Reactive.Windows.Threading" Version="3.1.1" /> |
||||
<PackageReference Condition="'$(TargetFramework)' == 'net461'" Include="System.Reactive.Windows.Threading" Version="3.0.0" /> |
|
||||
</ItemGroup> |
</ItemGroup> |
||||
</Project> |
</Project> |
||||
|
|||||
@ -1,22 +1,41 @@ |
|||||
<UserControl xmlns="https://github.com/avaloniaui"> |
<UserControl xmlns="https://github.com/avaloniaui"> |
||||
<StackPanel Orientation="Vertical" Gap="4"> |
<StackPanel Orientation="Vertical" |
||||
<TextBlock Classes="h1">ToolTip</TextBlock> |
Gap="4"> |
||||
<TextBlock Classes="h2">A control which pops up a hint when a control is hovered</TextBlock> |
<TextBlock Classes="h1">ToolTip</TextBlock> |
||||
|
<TextBlock Classes="h2">A control which pops up a hint when a control is hovered</TextBlock> |
||||
|
|
||||
<StackPanel Orientation="Horizontal" |
<Grid RowDefinitions="Auto,Auto" |
||||
|
ColumnDefinitions="Auto,Auto" |
||||
Margin="0,16,0,0" |
Margin="0,16,0,0" |
||||
HorizontalAlignment="Center" |
HorizontalAlignment="Center"> |
||||
Gap="16"> |
<Border Grid.Column="0" |
||||
<Border Background="{StyleResource ThemeAccentBrush}" |
Grid.Row="1" |
||||
Padding="48,48,48,48"> |
Background="{StyleResource ThemeAccentBrush}" |
||||
<ToolTip.Tip> |
Margin="5" |
||||
<StackPanel> |
Padding="50" |
||||
<TextBlock Classes="h1">ToolTip</TextBlock> |
ToolTip.Tip="This is a ToolTip"> |
||||
<TextBlock Classes="h2">A control which pops up a hint when a control is hovered</TextBlock> |
<TextBlock>Hover Here</TextBlock> |
||||
</StackPanel> |
</Border> |
||||
</ToolTip.Tip> |
<CheckBox Grid.Column="1" |
||||
<TextBlock>Hover Here</TextBlock> |
Margin="5" |
||||
</Border> |
Grid.Row="0" |
||||
|
IsChecked="{Binding ElementName=Border, Path=(ToolTip.IsOpen)}" |
||||
|
Content="ToolTip Open" /> |
||||
|
<Border Name="Border" |
||||
|
Grid.Column="1" |
||||
|
Grid.Row="1" |
||||
|
Background="{StyleResource ThemeAccentBrush}" |
||||
|
Margin="5" |
||||
|
Padding="50" |
||||
|
ToolTip.Placement="Bottom"> |
||||
|
<ToolTip.Tip> |
||||
|
<StackPanel> |
||||
|
<TextBlock Classes="h1">ToolTip</TextBlock> |
||||
|
<TextBlock Classes="h2">A control which pops up a hint when a control is hovered</TextBlock> |
||||
|
</StackPanel> |
||||
|
</ToolTip.Tip> |
||||
|
<TextBlock>ToolTip bottom placement</TextBlock> |
||||
|
</Border> |
||||
|
</Grid> |
||||
</StackPanel> |
</StackPanel> |
||||
</StackPanel> |
|
||||
</UserControl> |
</UserControl> |
||||
@ -0,0 +1,98 @@ |
|||||
|
using System; |
||||
|
using Avalonia.Input; |
||||
|
using Avalonia.Threading; |
||||
|
|
||||
|
namespace Avalonia.Controls |
||||
|
{ |
||||
|
/// <summary>
|
||||
|
/// Handeles <see cref="ToolTip"/> interaction with controls.
|
||||
|
/// </summary>
|
||||
|
internal sealed class ToolTipService |
||||
|
{ |
||||
|
public static ToolTipService Instance { get; } = new ToolTipService(); |
||||
|
|
||||
|
private DispatcherTimer _timer; |
||||
|
|
||||
|
private ToolTipService() { } |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// called when the <see cref="ToolTip.TipProperty"/> property changes on a control.
|
||||
|
/// </summary>
|
||||
|
/// <param name="e">The event args.</param>
|
||||
|
internal void TipChanged(AvaloniaPropertyChangedEventArgs e) |
||||
|
{ |
||||
|
var control = (Control)e.Sender; |
||||
|
|
||||
|
if (e.OldValue != null) |
||||
|
{ |
||||
|
control.PointerEnter -= ControlPointerEnter; |
||||
|
control.PointerLeave -= ControlPointerLeave; |
||||
|
} |
||||
|
|
||||
|
if (e.NewValue != null) |
||||
|
{ |
||||
|
control.PointerEnter += ControlPointerEnter; |
||||
|
control.PointerLeave += ControlPointerLeave; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Called when the pointer enters a control with an attached tooltip.
|
||||
|
/// </summary>
|
||||
|
/// <param name="sender">The event sender.</param>
|
||||
|
/// <param name="e">The event args.</param>
|
||||
|
private void ControlPointerEnter(object sender, PointerEventArgs e) |
||||
|
{ |
||||
|
StopTimer(); |
||||
|
|
||||
|
var control = (Control)sender; |
||||
|
var showDelay = ToolTip.GetShowDelay(control); |
||||
|
if (showDelay == 0) |
||||
|
{ |
||||
|
Open(control); |
||||
|
} |
||||
|
else |
||||
|
{ |
||||
|
StartShowTimer(showDelay, control); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Called when the pointer leaves a control with an attached tooltip.
|
||||
|
/// </summary>
|
||||
|
/// <param name="sender">The event sender.</param>
|
||||
|
/// <param name="e">The event args.</param>
|
||||
|
private void ControlPointerLeave(object sender, PointerEventArgs e) |
||||
|
{ |
||||
|
var control = (Control)sender; |
||||
|
Close(control); |
||||
|
} |
||||
|
|
||||
|
private void StartShowTimer(int showDelay, Control control) |
||||
|
{ |
||||
|
_timer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(showDelay) }; |
||||
|
_timer.Tick += (o, e) => Open(control); |
||||
|
_timer.Start(); |
||||
|
} |
||||
|
|
||||
|
private void Open(Control control) |
||||
|
{ |
||||
|
StopTimer(); |
||||
|
|
||||
|
ToolTip.SetIsOpen(control, true); |
||||
|
} |
||||
|
|
||||
|
private void Close(Control control) |
||||
|
{ |
||||
|
StopTimer(); |
||||
|
|
||||
|
ToolTip.SetIsOpen(control, false); |
||||
|
} |
||||
|
|
||||
|
private void StopTimer() |
||||
|
{ |
||||
|
_timer?.Stop(); |
||||
|
_timer = null; |
||||
|
} |
||||
|
} |
||||
|
} |
||||
@ -1,75 +1,21 @@ |
|||||
<?xml version="1.0" encoding="utf-8"?> |
<Project Sdk="Microsoft.NET.Sdk"> |
||||
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
<PropertyGroup> |
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> |
<TargetFramework>net461</TargetFramework> |
||||
<PropertyGroup> |
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> |
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
<DocumentationFile>bin\$(Configuration)\Avalonia.DotNetFrameworkRuntime.xml</DocumentationFile> |
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
<DefineConstants>$(DefineConstants);FULLDOTNET</DefineConstants> |
||||
<ProjectGuid>{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}</ProjectGuid> |
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> |
||||
<OutputType>Library</OutputType> |
</PropertyGroup> |
||||
<AppDesignerFolder>Properties</AppDesignerFolder> |
<ItemGroup> |
||||
<RootNamespace>Avalonia.DotNetFrameworkRuntime</RootNamespace> |
<Compile Include="..\Shared\SharedAssemblyInfo.cs"> |
||||
<AssemblyName>Avalonia.DotNetFrameworkRuntime</AssemblyName> |
<Link>Properties\SharedAssemblyInfo.cs</Link> |
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> |
</Compile> |
||||
<FileAlignment>512</FileAlignment> |
|
||||
<TargetFrameworkProfile /> |
<ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" /> |
||||
</PropertyGroup> |
<ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" /> |
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> |
<ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" /> |
||||
<DebugSymbols>true</DebugSymbols> |
<ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" /> |
||||
<DebugType>full</DebugType> |
</ItemGroup> |
||||
<Optimize>false</Optimize> |
<Import Project="..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" /> |
||||
<OutputPath>bin\Debug\</OutputPath> |
<Import Project="..\..\build\Rx.props" /> |
||||
<DefineConstants>TRACE;DEBUG;FULLDOTNET</DefineConstants> |
|
||||
<ErrorReport>prompt</ErrorReport> |
|
||||
<WarningLevel>4</WarningLevel> |
|
||||
<DocumentationFile>bin\Debug\Avalonia.DotNetFrameworkRuntime.xml</DocumentationFile> |
|
||||
</PropertyGroup> |
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "> |
|
||||
<DebugType>pdbonly</DebugType> |
|
||||
<Optimize>true</Optimize> |
|
||||
<OutputPath>bin\Release\</OutputPath> |
|
||||
<DefineConstants>TRACE;FULLDOTNET</DefineConstants> |
|
||||
<ErrorReport>prompt</ErrorReport> |
|
||||
<WarningLevel>4</WarningLevel> |
|
||||
<DocumentationFile>bin\Release\Avalonia.DotNetFrameworkRuntime.xml</DocumentationFile> |
|
||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> |
|
||||
</PropertyGroup> |
|
||||
<ItemGroup> |
|
||||
<Reference Include="System" /> |
|
||||
<Reference Include="System.Core" /> |
|
||||
<Reference Include="System.Xml.Linq" /> |
|
||||
<Reference Include="System.Data.DataSetExtensions" /> |
|
||||
<Reference Include="Microsoft.CSharp" /> |
|
||||
<Reference Include="System.Data" /> |
|
||||
<Reference Include="System.Net.Http" /> |
|
||||
<Reference Include="System.Xml" /> |
|
||||
</ItemGroup> |
|
||||
<ItemGroup> |
|
||||
<Compile Include="..\Shared\SharedAssemblyInfo.cs"> |
|
||||
<Link>Properties\SharedAssemblyInfo.cs</Link> |
|
||||
</Compile> |
|
||||
<Compile Include="AppBuilder.cs" /> |
|
||||
<Compile Include="Properties\AssemblyInfo.cs" /> |
|
||||
<Compile Include="RuntimeInfo.cs" /> |
|
||||
</ItemGroup> |
|
||||
<ItemGroup> |
|
||||
<ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj"> |
|
||||
<Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project> |
|
||||
<Name>Avalonia.Base</Name> |
|
||||
</ProjectReference> |
|
||||
<ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj"> |
|
||||
<Project>{D2221C82-4A25-4583-9B43-D791E3F6820C}</Project> |
|
||||
<Name>Avalonia.Controls</Name> |
|
||||
</ProjectReference> |
|
||||
<ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj"> |
|
||||
<Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project> |
|
||||
<Name>Avalonia.Visuals</Name> |
|
||||
</ProjectReference> |
|
||||
<ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj"> |
|
||||
<Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project> |
|
||||
<Name>Avalonia.Styling</Name> |
|
||||
</ProjectReference> |
|
||||
</ItemGroup> |
|
||||
<Import Project="..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" /> |
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
|
||||
<Import Project="..\..\build\Rx.props" /> |
|
||||
</Project> |
</Project> |
||||
@ -1,15 +0,0 @@ |
|||||
using System.Reflection; |
|
||||
using System.Runtime.InteropServices; |
|
||||
|
|
||||
// General Information about an assembly is controlled through the following
|
|
||||
// set of attributes. Change these attribute values to modify the information
|
|
||||
// associated with an assembly.
|
|
||||
[assembly: AssemblyTitle("Avalonia.DotNetFrameworkRuntime")] |
|
||||
|
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
|
||||
// to COM components. If you need to access a type in this assembly from
|
|
||||
// COM, set the ComVisible attribute to true on that type.
|
|
||||
[assembly: ComVisible(false)] |
|
||||
|
|
||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
|
||||
[assembly: Guid("4a1abb09-9047-4bd5-a4ad-a055e52c5ee0")] |
|
||||
@ -0,0 +1,24 @@ |
|||||
|
// Copyright (c) The Avalonia Project. All rights reserved.
|
||||
|
// Licensed under the MIT license. See licence.md file in the project root for full license information.
|
||||
|
|
||||
|
using Avalonia.Controls; |
||||
|
using Avalonia.Threading; |
||||
|
using ReactiveUI; |
||||
|
using System; |
||||
|
using System.Reactive.Concurrency; |
||||
|
using System.Threading; |
||||
|
|
||||
|
namespace Avalonia |
||||
|
{ |
||||
|
public static class AppBuilderExtensions |
||||
|
{ |
||||
|
public static TAppBuilder UseReactiveUI<TAppBuilder>(this TAppBuilder builder) |
||||
|
where TAppBuilder : AppBuilderBase<TAppBuilder>, new() |
||||
|
{ |
||||
|
return builder.AfterSetup(_ => |
||||
|
{ |
||||
|
RxApp.MainThreadScheduler = AvaloniaScheduler.Instance; |
||||
|
}); |
||||
|
} |
||||
|
} |
||||
|
} |
||||
@ -1,23 +0,0 @@ |
|||||
// Copyright (c) The Avalonia Project. All rights reserved.
|
|
||||
// Licensed under the MIT license. See licence.md file in the project root for full license information.
|
|
||||
|
|
||||
using System; |
|
||||
using System.Reactive.Concurrency; |
|
||||
using System.Threading; |
|
||||
|
|
||||
|
|
||||
namespace ReactiveUI |
|
||||
{ |
|
||||
/// <summary>
|
|
||||
/// Ignore me. This class is a secret handshake between RxUI and RxUI.Xaml
|
|
||||
/// in order to register certain classes on startup that would be difficult
|
|
||||
/// to register otherwise.
|
|
||||
/// </summary>
|
|
||||
public class PlatformRegistrations : IWantsToRegisterStuff |
|
||||
{ |
|
||||
public void Register(Action<Func<object>, Type> registerFunction) |
|
||||
{ |
|
||||
RxApp.MainThreadScheduler = new SynchronizationContextScheduler(SynchronizationContext.Current); |
|
||||
} |
|
||||
} |
|
||||
} |
|
||||
@ -1,34 +0,0 @@ |
|||||
using System; |
|
||||
using System.Collections.Generic; |
|
||||
using System.Text; |
|
||||
|
|
||||
namespace System.Runtime.Serialization |
|
||||
{ |
|
||||
class IgnoreDataMemberAttribute : Attribute |
|
||||
{ |
|
||||
} |
|
||||
|
|
||||
class DataMemberAttribute : Attribute |
|
||||
{ |
|
||||
} |
|
||||
class OnDeserializedAttribute : Attribute |
|
||||
{ |
|
||||
} |
|
||||
|
|
||||
class DataContractAttribute : Attribute |
|
||||
{ |
|
||||
} |
|
||||
|
|
||||
class StreamingContext { } |
|
||||
} |
|
||||
|
|
||||
namespace System.Diagnostics.Contracts |
|
||||
{ |
|
||||
static class Contract |
|
||||
{ |
|
||||
public static void Requires(bool condition) |
|
||||
{ |
|
||||
|
|
||||
} |
|
||||
} |
|
||||
} |
|
||||
@ -1 +0,0 @@ |
|||||
Subproject commit 3f725c808b1d4c8457f0d3204e0a071aa462cd75 |
|
||||
@ -0,0 +1,19 @@ |
|||||
|
// Copyright (c) The Avalonia Project. All rights reserved.
|
||||
|
// Licensed under the MIT license. See licence.md file in the project root for full license information.
|
||||
|
|
||||
|
using System; |
||||
|
using System.Collections.Generic; |
||||
|
|
||||
|
namespace Avalonia.Controls |
||||
|
{ |
||||
|
/// <summary>
|
||||
|
/// An indexed dictionary of resources.
|
||||
|
/// </summary>
|
||||
|
public interface IResourceDictionary : IResourceProvider, IDictionary<object, object> |
||||
|
{ |
||||
|
/// <summary>
|
||||
|
/// Gets a collection of child resource dictionaries.
|
||||
|
/// </summary>
|
||||
|
IList<IResourceProvider> MergedDictionaries { get; } |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,15 @@ |
|||||
|
using System; |
||||
|
|
||||
|
namespace Avalonia.Controls |
||||
|
{ |
||||
|
/// <summary>
|
||||
|
/// Represents resource provider in a tree.
|
||||
|
/// </summary>
|
||||
|
public interface IResourceNode : IResourceProvider |
||||
|
{ |
||||
|
/// <summary>
|
||||
|
/// Gets the parent resource node, if any.
|
||||
|
/// </summary>
|
||||
|
IResourceNode ResourceParent { get; } |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,33 @@ |
|||||
|
using System; |
||||
|
|
||||
|
namespace Avalonia.Controls |
||||
|
{ |
||||
|
/// <summary>
|
||||
|
/// Represents an object that can be queried for resources.
|
||||
|
/// </summary>
|
||||
|
public interface IResourceProvider |
||||
|
{ |
||||
|
/// <summary>
|
||||
|
/// Raised when resources in the provider are changed.
|
||||
|
/// </summary>
|
||||
|
event EventHandler<ResourcesChangedEventArgs> ResourcesChanged; |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Gets a value indicating whether the element has resources.
|
||||
|
/// </summary>
|
||||
|
bool HasResources { get; } |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Tries to find a resource within the provider.
|
||||
|
/// </summary>
|
||||
|
/// <param name="key">The resource key.</param>
|
||||
|
/// <param name="value">
|
||||
|
/// When this method returns, contains the value associated with the specified key,
|
||||
|
/// if the key is found; otherwise, null.
|
||||
|
/// </param>
|
||||
|
/// <returns>
|
||||
|
/// True if the resource if found, otherwise false.
|
||||
|
/// </returns>
|
||||
|
bool TryGetResource(string key, out object value); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,101 @@ |
|||||
|
// Copyright (c) The Avalonia Project. All rights reserved.
|
||||
|
// Licensed under the MIT license. See licence.md file in the project root for full license information.
|
||||
|
|
||||
|
using System; |
||||
|
using System.Collections.Generic; |
||||
|
using System.Collections.Specialized; |
||||
|
using System.Linq; |
||||
|
using Avalonia.Collections; |
||||
|
|
||||
|
namespace Avalonia.Controls |
||||
|
{ |
||||
|
/// <summary>
|
||||
|
/// An indexed dictionary of resources.
|
||||
|
/// </summary>
|
||||
|
public class ResourceDictionary : AvaloniaDictionary<object, object>, IResourceDictionary |
||||
|
{ |
||||
|
private AvaloniaList<IResourceProvider> _mergedDictionaries; |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Initializes a new instance of the <see cref="ResourceDictionary"/> class.
|
||||
|
/// </summary>
|
||||
|
public ResourceDictionary() |
||||
|
{ |
||||
|
CollectionChanged += OnCollectionChanged; |
||||
|
} |
||||
|
|
||||
|
/// <inheritdoc/>
|
||||
|
public event EventHandler<ResourcesChangedEventArgs> ResourcesChanged; |
||||
|
|
||||
|
/// <inheritdoc/>
|
||||
|
public IList<IResourceProvider> MergedDictionaries |
||||
|
{ |
||||
|
get |
||||
|
{ |
||||
|
if (_mergedDictionaries == null) |
||||
|
{ |
||||
|
_mergedDictionaries = new AvaloniaList<IResourceProvider>(); |
||||
|
_mergedDictionaries.ResetBehavior = ResetBehavior.Remove; |
||||
|
_mergedDictionaries.ForEachItem( |
||||
|
x => |
||||
|
{ |
||||
|
if (x.HasResources) |
||||
|
{ |
||||
|
OnResourcesChanged(); |
||||
|
} |
||||
|
|
||||
|
x.ResourcesChanged += MergedDictionaryResourcesChanged; |
||||
|
}, |
||||
|
x => |
||||
|
{ |
||||
|
if (x.HasResources) |
||||
|
{ |
||||
|
OnResourcesChanged(); |
||||
|
} |
||||
|
|
||||
|
x.ResourcesChanged -= MergedDictionaryResourcesChanged; |
||||
|
}, |
||||
|
() => { }); |
||||
|
} |
||||
|
|
||||
|
return _mergedDictionaries; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
/// <inheritdoc/>
|
||||
|
bool IResourceProvider.HasResources |
||||
|
{ |
||||
|
get => Count > 0 || (_mergedDictionaries?.Any(x => x.HasResources) ?? false); |
||||
|
} |
||||
|
|
||||
|
/// <inheritdoc/>
|
||||
|
public bool TryGetResource(string key, out object value) |
||||
|
{ |
||||
|
if (TryGetValue(key, out value)) |
||||
|
{ |
||||
|
return true; |
||||
|
} |
||||
|
|
||||
|
if (_mergedDictionaries != null) |
||||
|
{ |
||||
|
for (var i = _mergedDictionaries.Count - 1; i >= 0; --i) |
||||
|
{ |
||||
|
if (_mergedDictionaries[i].TryGetResource(key, out value)) |
||||
|
{ |
||||
|
return true; |
||||
|
} |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
return false; |
||||
|
} |
||||
|
|
||||
|
private void OnResourcesChanged() |
||||
|
{ |
||||
|
ResourcesChanged?.Invoke(this, new ResourcesChangedEventArgs()); |
||||
|
} |
||||
|
|
||||
|
private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) => OnResourcesChanged(); |
||||
|
private void MergedDictionaryResourcesChanged(object sender, ResourcesChangedEventArgs e) => OnResourcesChanged(); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,65 @@ |
|||||
|
using System; |
||||
|
using System.Reactive; |
||||
|
using System.Reactive.Linq; |
||||
|
|
||||
|
namespace Avalonia.Controls |
||||
|
{ |
||||
|
public static class ResourceProviderExtensions |
||||
|
{ |
||||
|
/// <summary>
|
||||
|
/// Finds the specified resource by searching up the logical tree and then global styles.
|
||||
|
/// </summary>
|
||||
|
/// <param name="control">The control.</param>
|
||||
|
/// <param name="key">The resource key.</param>
|
||||
|
/// <returns>The resource, or <see cref="AvaloniaProperty.UnsetValue"/> if not found.</returns>
|
||||
|
public static object FindResource(this IResourceNode control, string key) |
||||
|
{ |
||||
|
if (control.TryFindResource(key, out var value)) |
||||
|
{ |
||||
|
return value; |
||||
|
} |
||||
|
|
||||
|
return AvaloniaProperty.UnsetValue; |
||||
|
} |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Tries to the specified resource by searching up the logical tree and then global styles.
|
||||
|
/// </summary>
|
||||
|
/// <param name="control">The control.</param>
|
||||
|
/// <param name="key">The resource key.</param>
|
||||
|
/// <param name="value">On return, contains the resource if found, otherwise null.</param>
|
||||
|
/// <returns>True if the resource was found; otherwise false.</returns>
|
||||
|
public static bool TryFindResource(this IResourceNode control, string key, out object value) |
||||
|
{ |
||||
|
Contract.Requires<ArgumentNullException>(control != null); |
||||
|
Contract.Requires<ArgumentNullException>(key != null); |
||||
|
|
||||
|
var current = control; |
||||
|
|
||||
|
while (current != null) |
||||
|
{ |
||||
|
if (current is IResourceNode host) |
||||
|
{ |
||||
|
if (host.TryGetResource(key, out value)) |
||||
|
{ |
||||
|
return true; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
current = current.ResourceParent; |
||||
|
} |
||||
|
|
||||
|
value = null; |
||||
|
return false; |
||||
|
} |
||||
|
|
||||
|
public static IObservable<object> GetResourceObservable(this IResourceNode target, string key) |
||||
|
{ |
||||
|
return Observable.FromEventPattern<ResourcesChangedEventArgs>( |
||||
|
x => target.ResourcesChanged += x, |
||||
|
x => target.ResourcesChanged -= x) |
||||
|
.StartWith((EventPattern<ResourcesChangedEventArgs>)null) |
||||
|
.Select(x => target.FindResource(key)); |
||||
|
} |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,11 @@ |
|||||
|
// Copyright (c) The Avalonia Project. All rights reserved.
|
||||
|
// Licensed under the MIT license. See licence.md file in the project root for full license information.
|
||||
|
|
||||
|
using System; |
||||
|
|
||||
|
namespace Avalonia.Controls |
||||
|
{ |
||||
|
public class ResourcesChangedEventArgs : EventArgs |
||||
|
{ |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,32 @@ |
|||||
|
using System; |
||||
|
using System.Collections.Generic; |
||||
|
using System.Text; |
||||
|
using Avalonia.Controls; |
||||
|
|
||||
|
namespace Avalonia.Styling |
||||
|
{ |
||||
|
/// <summary>
|
||||
|
/// Defines an interface through which a <see cref="Style"/>'s parent can be set.
|
||||
|
/// </summary>
|
||||
|
/// <remarks>
|
||||
|
/// You should not usually need to use this interface - it is for internal use only.
|
||||
|
/// </remarks>
|
||||
|
public interface ISetStyleParent : IStyle |
||||
|
{ |
||||
|
/// <summary>
|
||||
|
/// Sets the style parent.
|
||||
|
/// </summary>
|
||||
|
/// <param name="parent">The parent.</param>
|
||||
|
void SetParent(IResourceNode parent); |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Notifies the style that a change has been made to resources that apply to it.
|
||||
|
/// </summary>
|
||||
|
/// <param name="e">The event args.</param>
|
||||
|
/// <remarks>
|
||||
|
/// This method will be called automatically by the framework, you should not need to call
|
||||
|
/// this method yourself.
|
||||
|
/// </remarks>
|
||||
|
void NotifyResourcesChanged(ResourcesChangedEventArgs e); |
||||
|
} |
||||
|
} |
||||
@ -1,42 +0,0 @@ |
|||||
// Copyright (c) The Avalonia Project. All rights reserved.
|
|
||||
// Licensed under the MIT license. See licence.md file in the project root for full license information.
|
|
||||
|
|
||||
using System; |
|
||||
|
|
||||
namespace Avalonia.Styling |
|
||||
{ |
|
||||
public static class StyleExtensions |
|
||||
{ |
|
||||
/// <summary>
|
|
||||
/// Tries to find a named style resource.
|
|
||||
/// </summary>
|
|
||||
/// <param name="control">The control from which to find the resource.</param>
|
|
||||
/// <param name="name">The resource name.</param>
|
|
||||
/// <returns>
|
|
||||
/// The resource if found, otherwise <see cref="AvaloniaProperty.UnsetValue"/>.
|
|
||||
/// </returns>
|
|
||||
public static object FindStyleResource(this IStyleHost control, string name) |
|
||||
{ |
|
||||
Contract.Requires<ArgumentNullException>(control != null); |
|
||||
Contract.Requires<ArgumentNullException>(name != null); |
|
||||
Contract.Requires<ArgumentException>(!string.IsNullOrWhiteSpace(name)); |
|
||||
|
|
||||
while (control != null) |
|
||||
{ |
|
||||
if (control.IsStylesInitialized) |
|
||||
{ |
|
||||
var result = control.Styles.FindResource(name); |
|
||||
|
|
||||
if (result != AvaloniaProperty.UnsetValue) |
|
||||
{ |
|
||||
return result; |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
control = control.StylingParent; |
|
||||
} |
|
||||
|
|
||||
return AvaloniaProperty.UnsetValue; |
|
||||
} |
|
||||
} |
|
||||
} |
|
||||
@ -1,90 +0,0 @@ |
|||||
using System; |
|
||||
using System.Collections; |
|
||||
using System.Collections.Generic; |
|
||||
|
|
||||
namespace Avalonia.Styling |
|
||||
{ |
|
||||
/// <summary>
|
|
||||
/// Holds resources for a <see cref="Style"/>.
|
|
||||
/// </summary>
|
|
||||
public class StyleResources : IDictionary<string, object>, IDictionary |
|
||||
{ |
|
||||
private Dictionary<string, object> _inner = new Dictionary<string, object>(); |
|
||||
|
|
||||
public object this[string key] |
|
||||
{ |
|
||||
get { return _inner[key]; } |
|
||||
set { _inner[key] = value; } |
|
||||
} |
|
||||
|
|
||||
public int Count => _inner.Count; |
|
||||
|
|
||||
ICollection<string> IDictionary<string, object>.Keys => _inner.Keys; |
|
||||
|
|
||||
ICollection<object> IDictionary<string, object>.Values => _inner.Values; |
|
||||
|
|
||||
bool ICollection<KeyValuePair<string, object>>.IsReadOnly => false; |
|
||||
|
|
||||
object IDictionary.this[object key] |
|
||||
{ |
|
||||
get { return ((IDictionary)_inner)[key]; } |
|
||||
set { ((IDictionary)_inner)[key] = value; } |
|
||||
} |
|
||||
|
|
||||
ICollection IDictionary.Keys => _inner.Keys; |
|
||||
|
|
||||
ICollection IDictionary.Values => _inner.Values; |
|
||||
|
|
||||
bool ICollection.IsSynchronized => false; |
|
||||
|
|
||||
object ICollection.SyncRoot => ((IDictionary)_inner).SyncRoot; |
|
||||
|
|
||||
bool IDictionary.IsFixedSize => false; |
|
||||
|
|
||||
bool IDictionary.IsReadOnly => false; |
|
||||
|
|
||||
public void Add(string key, object value) => _inner.Add(key, value); |
|
||||
|
|
||||
public void Clear() => _inner.Clear(); |
|
||||
|
|
||||
public bool ContainsKey(string key) => _inner.ContainsKey(key); |
|
||||
|
|
||||
public bool Remove(string key) => _inner.Remove(key); |
|
||||
|
|
||||
public IEnumerator<KeyValuePair<string, object>> GetEnumerator() => _inner.GetEnumerator(); |
|
||||
|
|
||||
public bool TryGetValue(string key, out object value) => _inner.TryGetValue(key, out value); |
|
||||
|
|
||||
bool ICollection<KeyValuePair<string, object>>.Contains(KeyValuePair<string, object> item) |
|
||||
{ |
|
||||
return ((IDictionary<string, object>)_inner).Contains(item); |
|
||||
} |
|
||||
|
|
||||
void ICollection<KeyValuePair<string, object>>.Add(KeyValuePair<string, object> item) |
|
||||
{ |
|
||||
((IDictionary<string, object>)_inner).Add(item); |
|
||||
} |
|
||||
|
|
||||
void ICollection<KeyValuePair<string, object>>.CopyTo(KeyValuePair<string, object>[] array, int arrayIndex) |
|
||||
{ |
|
||||
((IDictionary<string, object>)_inner).CopyTo(array, arrayIndex); |
|
||||
} |
|
||||
|
|
||||
bool ICollection<KeyValuePair<string, object>>.Remove(KeyValuePair<string, object> item) |
|
||||
{ |
|
||||
return ((IDictionary<string, object>)_inner).Remove(item); |
|
||||
} |
|
||||
|
|
||||
void ICollection.CopyTo(Array array, int index) => ((IDictionary)_inner).CopyTo(array, index); |
|
||||
|
|
||||
IEnumerator IEnumerable.GetEnumerator() => _inner.GetEnumerator(); |
|
||||
|
|
||||
IDictionaryEnumerator IDictionary.GetEnumerator() => ((IDictionary)_inner).GetEnumerator(); |
|
||||
|
|
||||
void IDictionary.Add(object key, object value) => ((IDictionary)_inner).Add(key, value); |
|
||||
|
|
||||
bool IDictionary.Contains(object key) => ((IDictionary)_inner).Contains(key); |
|
||||
|
|
||||
void IDictionary.Remove(object key) => ((IDictionary)_inner).Remove(key); |
|
||||
} |
|
||||
} |
|
||||
@ -0,0 +1,63 @@ |
|||||
|
using System; |
||||
|
using System.ComponentModel; |
||||
|
using Avalonia.Controls; |
||||
|
using Portable.Xaml.ComponentModel; |
||||
|
using Portable.Xaml.Markup; |
||||
|
|
||||
|
namespace Avalonia.Markup.Xaml.Data |
||||
|
{ |
||||
|
/// <summary>
|
||||
|
/// Loads a resource dictionary from a specified URL.
|
||||
|
/// </summary>
|
||||
|
public class ResourceInclude : MarkupExtension, IResourceProvider |
||||
|
{ |
||||
|
private Uri _baseUri; |
||||
|
private IResourceDictionary _loaded; |
||||
|
|
||||
|
public event EventHandler<ResourcesChangedEventArgs> ResourcesChanged; |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Gets the loaded resource dictionary.
|
||||
|
/// </summary>
|
||||
|
public IResourceDictionary Loaded |
||||
|
{ |
||||
|
get |
||||
|
{ |
||||
|
if (_loaded == null) |
||||
|
{ |
||||
|
var loader = new AvaloniaXamlLoader(); |
||||
|
_loaded = (IResourceDictionary)loader.Load(Source, _baseUri); |
||||
|
|
||||
|
if (_loaded.HasResources) |
||||
|
{ |
||||
|
ResourcesChanged?.Invoke(this, new ResourcesChangedEventArgs()); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
return _loaded; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Gets or sets the source URL.
|
||||
|
/// </summary>
|
||||
|
public Uri Source { get; set; } |
||||
|
|
||||
|
/// <inhertidoc/>
|
||||
|
bool IResourceProvider.HasResources => Loaded.HasResources; |
||||
|
|
||||
|
/// <inhertidoc/>
|
||||
|
bool IResourceProvider.TryGetResource(string key, out object value) |
||||
|
{ |
||||
|
return Loaded.TryGetResource(key, out value); |
||||
|
} |
||||
|
|
||||
|
/// <inhertidoc/>
|
||||
|
public override object ProvideValue(IServiceProvider serviceProvider) |
||||
|
{ |
||||
|
var tdc = (ITypeDescriptorContext)serviceProvider; |
||||
|
_baseUri = tdc?.GetBaseUri(); |
||||
|
return this; |
||||
|
} |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,71 @@ |
|||||
|
// Copyright (c) The Avalonia Project. All rights reserved.
|
||||
|
// Licensed under the MIT license. See licence.md file in the project root for full license information.
|
||||
|
|
||||
|
using System; |
||||
|
using System.ComponentModel; |
||||
|
using System.Linq; |
||||
|
using System.Reactive.Linq; |
||||
|
using Avalonia.Controls; |
||||
|
using Avalonia.Data; |
||||
|
using Portable.Xaml; |
||||
|
using Portable.Xaml.ComponentModel; |
||||
|
using Portable.Xaml.Markup; |
||||
|
|
||||
|
namespace Avalonia.Markup.Xaml.MarkupExtensions |
||||
|
{ |
||||
|
public class DynamicResourceExtension : MarkupExtension, IBinding |
||||
|
{ |
||||
|
private IResourceNode _anchor; |
||||
|
|
||||
|
public DynamicResourceExtension() |
||||
|
{ |
||||
|
} |
||||
|
|
||||
|
public DynamicResourceExtension(string resourceKey) |
||||
|
{ |
||||
|
ResourceKey = resourceKey; |
||||
|
} |
||||
|
|
||||
|
public string ResourceKey { get; set; } |
||||
|
|
||||
|
public override object ProvideValue(IServiceProvider serviceProvider) |
||||
|
{ |
||||
|
var context = (ITypeDescriptorContext)serviceProvider; |
||||
|
var provideTarget = context.GetService<IProvideValueTarget>(); |
||||
|
|
||||
|
if (!(provideTarget.TargetObject is IResourceNode)) |
||||
|
{ |
||||
|
_anchor = GetAnchor<IResourceNode>(context); |
||||
|
} |
||||
|
|
||||
|
return this; |
||||
|
} |
||||
|
|
||||
|
InstancedBinding IBinding.Initiate( |
||||
|
IAvaloniaObject target, |
||||
|
AvaloniaProperty targetProperty, |
||||
|
object anchor, |
||||
|
bool enableDataValidation) |
||||
|
{ |
||||
|
var control = target as IResourceNode ?? _anchor; |
||||
|
|
||||
|
if (control != null) |
||||
|
{ |
||||
|
return new InstancedBinding(control.GetResourceObservable(ResourceKey)); |
||||
|
} |
||||
|
|
||||
|
return null; |
||||
|
} |
||||
|
|
||||
|
private T GetAnchor<T>(ITypeDescriptorContext context) where T : class |
||||
|
{ |
||||
|
var schemaContext = context.GetService<IXamlSchemaContextProvider>().SchemaContext; |
||||
|
var ambientProvider = context.GetService<IAmbientProvider>(); |
||||
|
var xamlType = schemaContext.GetXamlType(typeof(T)); |
||||
|
|
||||
|
// We override XamlType.CanAssignTo in BindingXamlType so the results we get back
|
||||
|
// from GetAllAmbientValues aren't necessarily of the correct type.
|
||||
|
return ambientProvider.GetAllAmbientValues(xamlType).OfType<T>().FirstOrDefault(); |
||||
|
} |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,84 @@ |
|||||
|
// Copyright (c) The Avalonia Project. All rights reserved.
|
||||
|
// Licensed under the MIT license. See licence.md file in the project root for full license information.
|
||||
|
|
||||
|
using System; |
||||
|
using System.Collections.Generic; |
||||
|
using System.ComponentModel; |
||||
|
using System.Reflection; |
||||
|
using Avalonia.Controls; |
||||
|
using Avalonia.Markup.Xaml.Data; |
||||
|
using Portable.Xaml; |
||||
|
using Portable.Xaml.ComponentModel; |
||||
|
using Portable.Xaml.Markup; |
||||
|
|
||||
|
namespace Avalonia.Markup.Xaml.MarkupExtensions |
||||
|
{ |
||||
|
public class StaticResourceExtension : MarkupExtension |
||||
|
{ |
||||
|
public StaticResourceExtension() |
||||
|
{ |
||||
|
} |
||||
|
|
||||
|
public StaticResourceExtension(string resourceKey) |
||||
|
{ |
||||
|
ResourceKey = resourceKey; |
||||
|
} |
||||
|
|
||||
|
public string ResourceKey { get; set; } |
||||
|
|
||||
|
public override object ProvideValue(IServiceProvider serviceProvider) |
||||
|
{ |
||||
|
var context = (ITypeDescriptorContext)serviceProvider; |
||||
|
var schemaContext = context.GetService<IXamlSchemaContextProvider>().SchemaContext; |
||||
|
var ambientProvider = context.GetService<IAmbientProvider>(); |
||||
|
var resourceProviderType = schemaContext.GetXamlType(typeof(IResourceNode)); |
||||
|
var ambientValues = ambientProvider.GetAllAmbientValues(resourceProviderType); |
||||
|
|
||||
|
// Look upwards though the ambient context for IResourceProviders which might be able
|
||||
|
// to give us the resource.
|
||||
|
//
|
||||
|
// TODO: If we're in a template then only the ambient values since the root of the
|
||||
|
// template wil be included here. We need some way to get hold of the parent ambient
|
||||
|
// context and search that. See the test:
|
||||
|
//
|
||||
|
// StaticResource_Can_Be_Assigned_To_Property_In_ControlTemplate_In_Styles_File
|
||||
|
//
|
||||
|
foreach (var ambientValue in ambientValues) |
||||
|
{ |
||||
|
// We override XamlType.CanAssignTo in BindingXamlType so the results we get back
|
||||
|
// from GetAllAmbientValues aren't necessarily of the correct type.
|
||||
|
if (ambientValue is IResourceNode resourceProvider) |
||||
|
{ |
||||
|
if (resourceProvider is IControl control && control.StylingParent != null) |
||||
|
{ |
||||
|
// If we've got to a control that has a StylingParent then it's probably
|
||||
|
// a top level control and its StylingParent is pointing to the global
|
||||
|
// styles. If this is case just do a FindResource on it.
|
||||
|
return control.FindResource(ResourceKey); |
||||
|
} |
||||
|
else if (resourceProvider.TryGetResource(ResourceKey, out var value)) |
||||
|
{ |
||||
|
return value; |
||||
|
} |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
// The resource still hasn't been found, so add a delayed one-time binding.
|
||||
|
var provideTarget = context.GetService<IProvideValueTarget>(); |
||||
|
|
||||
|
if (provideTarget.TargetObject is IControl target && |
||||
|
provideTarget.TargetProperty is PropertyInfo property) |
||||
|
{ |
||||
|
DelayedBinding.Add(target, property, GetValue); |
||||
|
return AvaloniaProperty.UnsetValue; |
||||
|
} |
||||
|
|
||||
|
throw new KeyNotFoundException($"Static resource '{ResourceKey}' not found."); |
||||
|
} |
||||
|
|
||||
|
private object GetValue(IControl control) |
||||
|
{ |
||||
|
return control.FindResource(ResourceKey); |
||||
|
} |
||||
|
} |
||||
|
} |
||||
@ -1 +1 @@ |
|||||
Subproject commit dfc5affa5d8f4ddf5a7707e3202d5593519de640 |
Subproject commit eebf9dbb9275ecc48c18ec24f6fbad8cb494857f |
||||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue