Got rid of the SingleItemContainer

rds1983 · Oct 26, 2023 · e9842b1 · e9842b1
1 parent 30c5392
commit e9842b1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 63 deletions.
diff --git a/src/Myra/Graphics2D/UI/Selectors/TabControl.cs b/src/Myra/Graphics2D/UI/Selectors/TabControl.cs
@@ -17,7 +17,7 @@ public enum TabSelectorPosition
 	public class TabControl : Selector<Grid, TabItem>
 	{
 		private Grid _gridButtons;
-		private SingleItemContainer<Widget> _panelContent;
+		private Panel _panelContent;
 		private TabSelectorPosition _selectorPosition;
 		private ObservableCollection<Proportion> _buttonProportions;
 		private ObservableCollection<Proportion> _contentProportions;
@@ -162,11 +162,7 @@ public TabControl(string styleName = Stylesheet.DefaultStyleName) : base(new Gri
 			VerticalAlignment = VerticalAlignment.Top;
 
 			_gridButtons = new Grid();
-			_panelContent = new SingleItemContainer<Widget>()
-			{
-				HorizontalAlignment = HorizontalAlignment.Stretch,
-				VerticalAlignment = VerticalAlignment.Stretch
-			};
+			_panelContent = new Panel();
 			Grid.SetRow(_panelContent, 1);
 
 			// Default to Top selector position:
@@ -269,9 +265,10 @@ protected override void OnSelectedItemChanged()
 		{
 			base.OnSelectedItemChanged();
 
-			if (SelectedItem != null)
+			_panelContent.Widgets.Clear();
+			if (SelectedItem != null && SelectedItem.Content != null)
 			{
-				_panelContent.InternalChild = SelectedItem.Content;
+				_panelContent.Widgets.Add(SelectedItem.Content);
 			}
 		}
 

diff --git a/src/Myra/Graphics2D/UI/SingleItemContainer.cs b/src/Myra/Graphics2D/UI/SingleItemContainer.cs