perf: Push active system theme to ResourceDictionary

Avoids multiple conditional resolutions when resolving resources
unoplatform · May 20, 2021 · 2322829 · 2322829
1 parent f4651c9
commit 2322829
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Application.cs b/src/Uno.UI/UI/Xaml/Application.cs
@@ -140,7 +140,11 @@ internal SpecializedResourceDictionary.ResourceKey RequestedThemeForResources
 				return _requestedThemeForResources;
 			}
 
-			private set => _requestedThemeForResources = value;
+			private set
+			{
+				_requestedThemeForResources = value;
+				ResourceDictionary.SetActiveTheme(value);
+			}
 		}
 
 		internal ElementTheme ActualElementTheme => (_themeSetExplicitly, RequestedTheme) switch

diff --git a/src/Uno.UI/UI/Xaml/ResourceDictionary.cs b/src/Uno.UI/UI/Xaml/ResourceDictionary.cs
@@ -125,6 +125,7 @@ internal bool TryGetValue(string resourceKey, out object value, bool shouldCheck
 		internal bool TryGetValue(Type resourceKey, out object value, bool shouldCheckSystem)
 			=> TryGetValue(new ResourceKey(resourceKey), out value, shouldCheckSystem);
 
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		internal bool TryGetValue(in ResourceKey resourceKey, out object value, bool shouldCheckSystem) =>
 			TryGetValue(resourceKey, ResourceKey.Empty, out value, shouldCheckSystem);
 
@@ -534,23 +535,14 @@ public StaticResourceAliasRedirect(string resourceKey, XamlParseContext parseCon
 
 		internal static object GetStaticResourceAliasPassthrough(string resourceKey, XamlParseContext parseContext) => new StaticResourceAliasRedirect(resourceKey, parseContext);
 
+		internal static void SetActiveTheme(SpecializedResourceDictionary.ResourceKey key)
+			=> Themes.Active = key;
+
 		private static class Themes
 		{
 			public static SpecializedResourceDictionary.ResourceKey Light { get; } = "Light";
 			public static SpecializedResourceDictionary.ResourceKey Default { get; } = "Default";
-			public static SpecializedResourceDictionary.ResourceKey Active
-			{
-				get
-				{
-					var res = Application.Current?.RequestedThemeForResources;
-					if (res?.Key != null)
-					{
-						return res.Value;
-					}
-
-					return Light;
-				}
-			}
+			public static SpecializedResourceDictionary.ResourceKey Active { get; set; } = Light;
 		}
 	}
 }