Fix control catalog

AvaloniaUI · Aug 15, 2022 · a75fe22 · a75fe22
1 parent 7dfceb1
commit a75fe22
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 19 deletions.
diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs
@@ -7,6 +7,7 @@
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
 using Avalonia.Platform;
+using Avalonia.Styling;
 using Avalonia.Themes.Fluent;
 
 using ControlCatalog.Models;

diff --git a/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs b/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs
@@ -91,7 +91,7 @@ public static bool TryFindResource(this IResourceHost control, object key, Theme
             return false;
         }
 
-        /// <inheritdoc cref="IResourceHost.TryGetResource" />
+        /// <inheritdoc cref="IResourceNode.TryGetResource" />
         public static bool TryGetResource(this IResourceHost control, object key, out object? value)
         {
             control = control ?? throw new ArgumentNullException(nameof(control));

diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Input;
+using Avalonia.Styling;
 
 namespace Avalonia.Diagnostics
 {

diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -45,7 +45,6 @@ public object ProvideValue(IServiceProvider serviceProvider)
             }
 
             var previousWasControlTheme = false;
-            var firstParentVisited = false;
 
             // Look upwards though the ambient context for IResourceNodes
             // which might be able to give us the resource.
@@ -56,22 +55,24 @@ public object ProvideValue(IServiceProvider serviceProvider)
                     return ColorToBrushConverter.Convert(value, targetType);
                 }
 
-                // To get a fallback theme variant, check if static resource was invoked inside of the ResourceDictionary.ThemeDictionaries. 
-                if (themeVariant is null && firstParentVisited && containingDictionary is not null)
+                // To get a fallback theme variant, check if static resource was invoked inside of the ResourceDictionary.ThemeDictionaries.
+                if (themeVariant is null)
                 {
-                    if (parent is IResourceDictionary parentDictionary
-                        && parentDictionary.ThemeDictionaries
-                            .FirstOrDefault(p => p.Value == containingDictionary).Key is { } key)
+                    if (containingDictionary is not null)
                     {
-                        themeVariant = key;
+                        if (parent is ResourceDictionary parentDictionary
+                            && parentDictionary.ThemeDictionaries
+                                .FirstOrDefault(p => p.Value == containingDictionary).Key is { } key)
+                        {
+                            themeVariant = key;
+                        }
+
+                        containingDictionary = null;
+                    }
+                    else
+                    {
+                        containingDictionary = parent as ResourceDictionary;
                     }
-                    containingDictionary = null;
-                }
-
-                if (!firstParentVisited)
-                {
-                    firstParentVisited = true;
-                    containingDictionary = parent as IResourceDictionary;
                 }
 
                 // HACK: Temporary fix for #8678. Hard-coded to only work for the DevTools main

diff --git a/tests/Avalonia.Benchmarks/Styling/ResourceBenchmarks.cs b/tests/Avalonia.Benchmarks/Styling/ResourceBenchmarks.cs
@@ -45,7 +45,7 @@ private static Styles CreateTheme()
             return new Styles
             {
                 preHost,
-                new TestStyles(50, 3, 5),
+                new TestStyles(50, 3, 5, 0),
                 postHost
             };
         }

diff --git a/tests/Avalonia.Benchmarks/TestStyles.cs b/tests/Avalonia.Benchmarks/TestStyles.cs
@@ -1,10 +1,11 @@
-using Avalonia.Styling;
+using Avalonia.Controls;
+using Avalonia.Styling;
 
 namespace Avalonia.Benchmarks
 {
     public class TestStyles : Styles
     {
-        public TestStyles(int childStylesCount, int childInnerStyleCount, int childResourceCount)
+        public TestStyles(int childStylesCount, int childInnerStyleCount, int childResourceCount, int childThemeResourcesCount)
         {
             for (int i = 0; i < childStylesCount; i++)
             {
@@ -18,7 +19,19 @@ public TestStyles(int childStylesCount, int childInnerStyleCount, int childResou
                     {
                         childStyle.Resources.Add($"resource.{i}.{j}.{k}", null);
                     }
-
+
+                    if (childThemeResourcesCount > 0)
+                    {
+                        ResourceDictionary darkTheme, lightTheme;
+                        childStyle.Resources.ThemeDictionaries[ThemeVariant.Dark] = darkTheme = new ResourceDictionary();
+                        childStyle.Resources.ThemeDictionaries[ThemeVariant.Light] = lightTheme = new ResourceDictionary();
+                        for (int k = 0; k < childThemeResourcesCount; k++)
+                        {
+                            darkTheme.Add($"resource.theme.{i}.{j}.{k}", null);
+                            lightTheme.Add($"resource.theme.{i}.{j}.{k}", null);
+                        }
+                    }
+
                     childStyles.Add(childStyle);
                 }