Skip to content

Cleanup ResourceDictionary #21486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rmarinho merged 1 commit into from
Mar 28, 2024
Merged

Cleanup ResourceDictionary #21486

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions src/Controls/src/Core/ResourceDictionary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,8 @@ public Uri Source
public void SetAndCreateSource<T>(Uri value)
where T : ResourceDictionary, new()
{
_source = value;
_mergedInstance = s_instances.GetValue(typeof(T), static _ => new T());
OnValuesChanged(_mergedInstance.ToArray());
}

internal void SetAndLoadSource(Uri value, string resourcePath, Assembly assembly, global::System.Xml.IXmlLineInfo lineInfo)
{
_source = value;

//this will return a type if the RD as an x:Class element, and codebehind
var type = XamlResourceIdAttribute.GetTypeForPath(assembly, resourcePath);
if (type != null)
{
_mergedInstance = s_instances.GetValue(type, _ => (ResourceDictionary)Activator.CreateInstance(type));
OnValuesChanged(_mergedInstance.ToArray());
}
var instance = s_instances.GetValue(typeof(T), static _ => new T());
SetSource(value, instance);
}

internal static ResourceDictionary GetOrCreateInstance([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type type)
Expand Down