Merge pull request #402 from spacechase0/custom-widget-mml

Allow custom widgets when loading MML
rds1983 · Sep 19, 2024 · 3ed960e · 3ed960e
2 parents 005c032 + 086eaab
commit 3ed960e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/src/Myra/Graphics2D/UI/Project.cs b/src/Myra/Graphics2D/UI/Project.cs
@@ -185,7 +185,9 @@ internal SaveContext CreateSaveContext()
 			return CreateSaveContext(Stylesheet);
 		}
 
-		internal static LoadContext CreateLoadContext(AssetManager assetManager)
+		public static Dictionary<Assembly, string[]> ExtraWidgetAssembliesAndNamespaces = new Dictionary<Assembly, string[]>();
+
+		internal static LoadContext CreateLoadContext(IAssetManager assetManager)
 		{
 			Func<Type, string, object> resourceGetter = (t, name) =>
 			{
@@ -205,13 +207,11 @@ internal static LoadContext CreateLoadContext(AssetManager assetManager)
 				throw new Exception(string.Format("Type {0} isn't supported", t.Name));
 			};
 
+			Dictionary<Assembly, string[]> assemblies = new Dictionary<Assembly, string[]>(ExtraWidgetAssembliesAndNamespaces);
+			assemblies.Add(typeof(Widget).Assembly, new string[] { typeof(Widget).Namespace, typeof(PropertyGrid).Namespace });
 			return new LoadContext
 			{
-				Namespaces = new[]
-				{
-					typeof(Widget).Namespace,
-					typeof(PropertyGrid).Namespace,
-				},
+				Assemblies = assemblies,
 				LegacyClassNames = LegacyClassNames,
 				ObjectCreator = (t, el) => CreateItem(t, el),
 				ResourceGetter = resourceGetter

diff --git a/src/Myra/Graphics2D/UI/Styles/Stylesheet.cs b/src/Myra/Graphics2D/UI/Styles/Stylesheet.cs
@@ -4,6 +4,7 @@
 using System.Xml.Linq;
 using Myra.MML;
 using System.Collections;
+using System.Reflection;
 using FontStashSharp;
 using Myra.Graphics2D.TextureAtlases;
 using FontStashSharp.RichText;
@@ -410,9 +411,9 @@ public static Stylesheet LoadFromSource(string stylesheetXml,
 
 			var loadContext = new LoadContext
 			{
-				Namespaces = new[]
+				Assemblies = new Dictionary<Assembly, string[]>()
 				{
-					typeof(WidgetStyle).Namespace
+					{ typeof( WidgetStyle ).Assembly, new string[] { typeof( WidgetStyle ).Namespace } }
 				},
 				ResourceGetter = resourceGetter,
 				NodesToIgnore = new HashSet<string>(new[] { "Designer", "Colors", "Fonts" }),

diff --git a/src/Myra/MML/LoadContext.cs b/src/Myra/MML/LoadContext.cs
@@ -66,8 +66,7 @@ public void SetValue(object obj, object value)
 		public Dictionary<string, Color> Colors;
 		public HashSet<string> NodesToIgnore = null;
 		public Func<Type, XElement, object> ObjectCreator = (type, el) => Activator.CreateInstance(type);
-		public string[] Namespaces;
-		public Assembly Assembly = typeof(Widget).Assembly;
+		public Dictionary<Assembly, string[]> Assemblies;
 		public Func<Type, string, object> ResourceGetter = null;
 		public readonly List<Tuple<object, XElement>> ObjectsNodes = new List<Tuple<object, XElement>>();
 
@@ -317,14 +316,22 @@ where p.FindAttribute<ContentAttribute>()
 					}
 
 					Type itemType = null;
-					foreach(var ns in Namespaces)
+					foreach (var pair in Assemblies)
 					{
-						itemType = Assembly.GetType(ns + "." + widgetName);
-						if (itemType != null)
+						foreach (var ns in pair.Value)
 						{
-							break;
+							var widgetType = pair.Key.GetType(ns + "." + widgetName);
+							if (widgetType != null)
+							{
+								itemType = widgetType;
+								break;
+							}
 						}
+
+						if (itemType != null)
+							break;
 					}
+
 					if (itemType != null)
 					{
 						var item = ObjectCreator(itemType, child);