Browse Source

More simple theme renaming

pull/8653/head
robloo 4 years ago
parent
commit
e94eb0cbfd
  1. 4
      src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
  2. 2
      src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
  3. 2
      src/Avalonia.ReactiveUI/TransitioningContentControl.cs
  4. 2
      tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
  5. 2
      tests/Avalonia.LeakTests/ControlTests.cs
  6. 4
      tests/Avalonia.UnitTests/TestServices.cs

4
src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs

@ -326,8 +326,8 @@ namespace Avalonia.Build.Tasks
var op = i[c].Operand as MethodReference;
// TODO: Throw an error
// This usually happens when same XAML resource was added twice for some weird reason
// We currently support it for dual-named default theme resource
// This usually happens when the same XAML resource was added twice for some weird reason
// We currently support it for dual-named simple theme resources
if (op != null
&& op.Name == TrampolineName)
{

2
src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml

@ -41,7 +41,7 @@
<ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/ColorSpectrum.xaml" />
<!-- Controls -->
<!-- Note the ColorPicker and ColorView are unsupported in the default theme -->
<!-- Note the ColorPicker and ColorView are currently unsupported in the simple theme -->
<!-- These controls depend on fluent styles for TabControl, Button, TextBox, etc. -->
</ResourceDictionary.MergedDictionaries>

2
src/Avalonia.ReactiveUI/TransitioningContentControl.cs

@ -57,7 +57,7 @@ namespace Avalonia.ReactiveUI
/// <summary>
/// TransitioningContentControl uses the default ContentControl
/// template from Avalonia default theme.
/// template from Avalonia simple theme.
/// </summary>
Type IStyleable.StyleKey => typeof(ContentControl);

2
tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs

@ -41,7 +41,7 @@ namespace Avalonia.Benchmarks.Themes
[Benchmark]
[Arguments(SimpleThemeMode.Dark)]
[Arguments(SimpleThemeMode.Light)]
public bool InitDefaultTheme(SimpleThemeMode mode)
public bool InitSimpleTheme(SimpleThemeMode mode)
{
UnitTestApplication.Current.Styles[0] = new SimpleTheme(new Uri("resm:Styles?assembly=Avalonia.Benchmarks"))
{

2
tests/Avalonia.LeakTests/ControlTests.cs

@ -313,7 +313,7 @@ namespace Avalonia.LeakTests
var border = textBox.GetTemplateChildren().FirstOrDefault(x => x.Name == "border");
// The TextBox should have subscriptions to its Classes collection from the
// default theme.
// simple theme.
Assert.NotEqual(0, textBox.Classes.ListenerCount);
// Clear the content and ensure the TextBox is removed.

4
tests/Avalonia.UnitTests/TestServices.cs

@ -24,7 +24,7 @@ namespace Avalonia.UnitTests
renderInterface: new MockPlatformRenderInterface(),
standardCursorFactory: Mock.Of<ICursorFactory>(),
styler: new Styler(),
theme: () => CreateDefaultTheme(),
theme: () => CreateSimpleTheme(),
threadingInterface: Mock.Of<IPlatformThreadingInterface>(x => x.CurrentThreadIsLoopThread == true),
fontManagerImpl: new MockFontManagerImpl(),
textShaperImpl: new MockTextShaperImpl(),
@ -169,7 +169,7 @@ namespace Avalonia.UnitTests
windowImpl: windowImpl ?? WindowImpl);
}
private static IStyle CreateDefaultTheme()
private static IStyle CreateSimpleTheme()
{
return new SimpleTheme { Mode = SimpleThemeMode.Light };
}

Loading…
Cancel
Save