|
|
|
@ -1,9 +1,12 @@ |
|
|
|
using System.Linq; |
|
|
|
using System; |
|
|
|
using System.Linq; |
|
|
|
using Avalonia.Controls; |
|
|
|
using Avalonia.Controls.Documents; |
|
|
|
using Avalonia.Controls.Presenters; |
|
|
|
using Avalonia.Controls.Primitives; |
|
|
|
using Avalonia.Markup.Data; |
|
|
|
using Avalonia.Markup.Xaml.MarkupExtensions; |
|
|
|
using Avalonia.Markup.Xaml.Templates; |
|
|
|
using Avalonia.Media; |
|
|
|
using Avalonia.Styling; |
|
|
|
using Avalonia.UnitTests; |
|
|
|
@ -140,7 +143,7 @@ public class ThemeDictionariesTests : XamlTestBase |
|
|
|
Assert.Equal(Colors.Black, ((ISolidColorBrush)border.Background)!.Color); |
|
|
|
} |
|
|
|
|
|
|
|
[Fact(Skip = "Not implemented")] |
|
|
|
[Fact] |
|
|
|
public void StaticResource_Inside_Of_ThemeDictionaries_Should_Use_Same_Theme_Key() |
|
|
|
{ |
|
|
|
var themeVariantScope = (ThemeVariantScope)AvaloniaRuntimeXamlLoader.Load(@"
|
|
|
|
@ -183,6 +186,135 @@ public class ThemeDictionariesTests : XamlTestBase |
|
|
|
|
|
|
|
Assert.Equal(Colors.Black, ((ISolidColorBrush)border.Background)!.Color); |
|
|
|
} |
|
|
|
|
|
|
|
[Fact] |
|
|
|
public void StaticResource_Inside_Of_ThemeDictionaries_Should_Use_Same_Theme_Key_From_Inner_File() |
|
|
|
{ |
|
|
|
var documents = new[] |
|
|
|
{ |
|
|
|
new RuntimeXamlLoaderDocument(new Uri("avares://Tests/Inner.xaml"), @"
|
|
|
|
<ResourceDictionary xmlns='https://github.com/avaloniaui'
|
|
|
|
xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
|
|
|
|
<StaticResource x:Key='InnerKey' ResourceKey='OuterKey' /> |
|
|
|
</ResourceDictionary>"),
|
|
|
|
new RuntimeXamlLoaderDocument(@"
|
|
|
|
<ResourceDictionary xmlns='https://github.com/avaloniaui'
|
|
|
|
xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
|
|
|
|
<ResourceDictionary.ThemeDictionaries> |
|
|
|
<ResourceDictionary x:Key='Default'> |
|
|
|
<Color x:Key='OuterKey'>Green</Color> |
|
|
|
<ResourceDictionary.MergedDictionaries> |
|
|
|
<ResourceInclude Source='avares://Tests/Inner.xaml'/>
|
|
|
|
</ResourceDictionary.MergedDictionaries> |
|
|
|
</ResourceDictionary> |
|
|
|
<ResourceDictionary x:Key='Dark'> |
|
|
|
<Color x:Key='OuterKey'>White</Color> |
|
|
|
<ResourceDictionary.MergedDictionaries> |
|
|
|
<ResourceInclude Source='avares://Tests/Inner.xaml'/>
|
|
|
|
</ResourceDictionary.MergedDictionaries> |
|
|
|
</ResourceDictionary> |
|
|
|
</ResourceDictionary.ThemeDictionaries> |
|
|
|
</ResourceDictionary>")
|
|
|
|
}; |
|
|
|
|
|
|
|
var parsed = AvaloniaRuntimeXamlLoader.LoadGroup(documents); |
|
|
|
var dictionary = (ResourceDictionary)parsed[1]!; |
|
|
|
|
|
|
|
dictionary.TryGetResource("InnerKey", ThemeVariant.Dark, out var resource); |
|
|
|
var colorResource = Assert.IsType<Color>(resource); |
|
|
|
Assert.Equal(Colors.White, colorResource); |
|
|
|
|
|
|
|
dictionary.TryGetResource("InnerKey", ThemeVariant.Light, out resource); |
|
|
|
colorResource = Assert.IsType<Color>(resource); |
|
|
|
Assert.Equal(Colors.Green, colorResource); |
|
|
|
} |
|
|
|
|
|
|
|
[Fact] |
|
|
|
public void DynamicResource_Inside_Of_ThemeDictionaries_Should_Use_Same_Theme_Key_From_Inner_File() |
|
|
|
{ |
|
|
|
var documents = new[] |
|
|
|
{ |
|
|
|
new RuntimeXamlLoaderDocument(new Uri("avares://Tests/Inner.xaml"), @"
|
|
|
|
<ResourceDictionary xmlns='https://github.com/avaloniaui'
|
|
|
|
xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
|
|
|
|
<SolidColorBrush x:Key='InnerKey' Color='{DynamicResource OuterKey}' /> |
|
|
|
</ResourceDictionary>"),
|
|
|
|
new RuntimeXamlLoaderDocument(@"
|
|
|
|
<ResourceDictionary xmlns='https://github.com/avaloniaui'
|
|
|
|
xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
|
|
|
|
<ResourceDictionary.ThemeDictionaries> |
|
|
|
<ResourceDictionary x:Key='Default'> |
|
|
|
<Color x:Key='OuterKey'>Green</Color> |
|
|
|
<ResourceDictionary.MergedDictionaries> |
|
|
|
<ResourceInclude Source='avares://Tests/Inner.xaml'/>
|
|
|
|
</ResourceDictionary.MergedDictionaries> |
|
|
|
</ResourceDictionary> |
|
|
|
<ResourceDictionary x:Key='Dark'> |
|
|
|
<Color x:Key='OuterKey'>White</Color> |
|
|
|
<ResourceDictionary.MergedDictionaries> |
|
|
|
<ResourceInclude Source='avares://Tests/Inner.xaml'/>
|
|
|
|
</ResourceDictionary.MergedDictionaries> |
|
|
|
</ResourceDictionary> |
|
|
|
</ResourceDictionary.ThemeDictionaries> |
|
|
|
</ResourceDictionary>")
|
|
|
|
}; |
|
|
|
|
|
|
|
var parsed = AvaloniaRuntimeXamlLoader.LoadGroup(documents); |
|
|
|
var dictionary1 = (ResourceDictionary)parsed[0]!; |
|
|
|
var dictionary2 = (ResourceDictionary)parsed[1]!; |
|
|
|
var ownerApp = new Application(); // DynamicResource needs an owner to work
|
|
|
|
ownerApp.RequestedThemeVariant = new ThemeVariant("FakeOne", null); |
|
|
|
ownerApp.Resources.MergedDictionaries.Add(dictionary1); |
|
|
|
ownerApp.Resources.MergedDictionaries.Add(dictionary2); |
|
|
|
|
|
|
|
dictionary2.TryGetResource("InnerKey", ThemeVariant.Dark, out var resource); |
|
|
|
var colorResource = Assert.IsAssignableFrom<ISolidColorBrush>(resource); |
|
|
|
Assert.Equal(Colors.White, colorResource.Color); |
|
|
|
|
|
|
|
dictionary2.TryGetResource("InnerKey", ThemeVariant.Light, out resource); |
|
|
|
colorResource = Assert.IsAssignableFrom<ISolidColorBrush>(resource); |
|
|
|
Assert.Equal(Colors.Green, colorResource.Color); |
|
|
|
} |
|
|
|
|
|
|
|
[Fact] |
|
|
|
public void DynamicResource_Inside_Control_Inside_Of_ThemeDictionaries_Should_Use_Control_Theme_Variant() |
|
|
|
{ |
|
|
|
var documents = new[] |
|
|
|
{ |
|
|
|
new RuntimeXamlLoaderDocument(@"
|
|
|
|
<ResourceDictionary xmlns='https://github.com/avaloniaui'
|
|
|
|
xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
|
|
|
|
<ResourceDictionary.ThemeDictionaries> |
|
|
|
<ResourceDictionary x:Key='Light'> |
|
|
|
<Color x:Key='ResourceKey'>Green</Color> |
|
|
|
<Template x:Key='Template'> |
|
|
|
<ThemeVariantScope RequestedThemeVariant='Dark' TextElement.Foreground='{DynamicResource ResourceKey}' /> |
|
|
|
</Template> |
|
|
|
</ResourceDictionary> |
|
|
|
<ResourceDictionary x:Key='Dark'> |
|
|
|
<Color x:Key='ResourceKey'>White</Color> |
|
|
|
<Template x:Key='Template'> |
|
|
|
<ThemeVariantScope RequestedThemeVariant='Light' TextElement.Foreground='{DynamicResource ResourceKey}' /> |
|
|
|
</Template> |
|
|
|
</ResourceDictionary> |
|
|
|
</ResourceDictionary.ThemeDictionaries> |
|
|
|
</ResourceDictionary>")
|
|
|
|
}; |
|
|
|
|
|
|
|
var parsed = AvaloniaRuntimeXamlLoader.LoadGroup(documents); |
|
|
|
var dictionary = (ResourceDictionary)parsed[0]!; |
|
|
|
|
|
|
|
dictionary.TryGetResource("Template", ThemeVariant.Dark, out var resource); |
|
|
|
var control = Assert.IsType<ThemeVariantScope>((resource as Template)?.Build()); |
|
|
|
control.Resources.MergedDictionaries.Add(dictionary); |
|
|
|
Assert.Equal(Colors.Green, ((ISolidColorBrush)control[TextElement.ForegroundProperty]!).Color); |
|
|
|
control.Resources.MergedDictionaries.Remove(dictionary); |
|
|
|
|
|
|
|
dictionary.TryGetResource("Template", ThemeVariant.Light, out resource); |
|
|
|
control = Assert.IsType<ThemeVariantScope>((resource as Template)?.Build()); |
|
|
|
control.Resources.MergedDictionaries.Add(dictionary); |
|
|
|
Assert.Equal(Colors.White, ((ISolidColorBrush)control[TextElement.ForegroundProperty]!).Color); |
|
|
|
} |
|
|
|
|
|
|
|
[Fact] |
|
|
|
public void StaticResource_Outside_Of_Dictionaries_Should_Use_Control_ThemeVariant() |
|
|
|
|
Max Katz
3 years ago