Fixed build

rds1983 · Oct 22, 2023 · d6cd08e · d6cd08e
1 parent fab81ac
commit d6cd08e
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
diff --git a/src/Myra.Tests/MMLTests.cs b/src/Myra.Tests/MMLTests.cs
@@ -19,12 +19,12 @@ public void LoadMMLWithExternalAssets()
 
 			var project = Project.LoadFromXml(mml, assetManager);
 
-			var imageButton1 = (ImageButton)project.Root.FindWidgetById("spawnUnit1");
+			var imageButton1 = (ImageButton)project.Root.FindChildById("spawnUnit1");
 			Assert.IsNotNull(imageButton1);
 			Assert.IsNotNull(imageButton1.Image);
 			Assert.AreEqual(imageButton1.Image.Size, new Point(64, 64));
 
-			var label = (Label)project.Root.FindWidgetById("label");
+			var label = (Label)project.Root.FindChildById("label");
 			Assert.IsNotNull(label);
 			Assert.IsNotNull(label.Font);
 		}

diff --git a/src/Myra.Tests/StackPanelTests.cs b/src/Myra.Tests/StackPanelTests.cs
@@ -14,11 +14,11 @@ public void AddRemove()
 			var label2 = new Label();
 			var label3 = new Label();
 
-			stackPanel.AddChild(label1);
-			stackPanel.AddChild(label2);
-			stackPanel.AddChild(label3);
+			stackPanel.Widgets.Add(label1);
+			stackPanel.Widgets.Add(label2);
+			stackPanel.Widgets.Add(label3);
 
-			stackPanel.RemoveChild(label2);
+			stackPanel.Widgets.Remove(label2);
 
 			Assert.AreEqual(2, stackPanel.Widgets.Count);
 			Assert.AreEqual(label1, stackPanel.Widgets[0]);

diff --git a/src/Myra/Graphics2D/UI/Containers/MultipleItemsContainerBase.cs b/src/Myra/Graphics2D/UI/Containers/MultipleItemsContainerBase.cs
@@ -1,4 +1,5 @@
 using Myra.Attributes;
+using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 
@@ -29,5 +30,18 @@ public MultipleItemsContainerBase()
 			HorizontalAlignment = HorizontalAlignment.Stretch;
 			VerticalAlignment = VerticalAlignment.Stretch;
 		}
+
+		[Obsolete("Use Widgets.Add")]
+		public void AddChild(Widget child)
+		{
+			Widgets.Add(child);
+		}
+
+		[Obsolete("Use Widgets.Remove")]
+		public void RemoveChild(Widget child)
+		{
+			Widgets.Remove(child);
+		}
+
 	}
 }
diff --git a/src/Myra/Graphics2D/UI/Selector.cs → src/Myra/Graphics2D/UI/Selectors/Selector.cs b/src/Myra/Graphics2D/UI/Selector.cs → src/Myra/Graphics2D/UI/Selectors/Selector.cs
diff --git a/src/Myra/Graphics2D/UI/Widget.Children.cs b/src/Myra/Graphics2D/UI/Widget.Children.cs
@@ -249,5 +249,14 @@ internal static Widget FindChild(Widget Widget, Func<Widget, bool> predicate = n
 
 			return null;
 		}
+
+		/// <summary>
+		/// Finds the first widget with matching <paramref name="Id"/>
+		/// </summary>
+		/// <param name="Id">Id to match on</param>
+		/// <returns>Widget instance if found otherwise null</returns>
+
+		[Obsolete("Use FindChildById")]
+		public Widget FindWidgetById(string Id) => FindChildById(Id);
 	}
 }