Fix warnings

Directory.Build.props

@@ -6,7 +6,7 @@
     <PackageProjectUrl>https://github.com/rds1983/Myra</PackageProjectUrl>
     <RootNamespace>Myra</RootNamespace>
     <Description>UI Library for MonoGame, FNA and Stride</Description>
-    <VersionPrefix>1.4.5</VersionPrefix>
+    <VersionPrefix>1.5.0</VersionPrefix>
     <XNAssetsVersion>0.6.7</XNAssetsVersion>
     <FontStashSharpVersion>1.3.0</FontStashSharpVersion>
     <LangVersion>8.0</LangVersion>

samples/Myra.Samples.Silk.NET.TrippyGL/AllWidgets.Generated.cs

@@ -399,17 +399,9 @@ private void BuildUI()
 			var horizontalSplitPane1 = new HorizontalSplitPane();
 			horizontalSplitPane1.Widgets.Add(scrollViewer1);
 			horizontalSplitPane1.Widgets.Add(verticalSplitPane1);
-
+			StackPanel.SetProportionType(horizontalSplitPane1, ProportionType.Fill);
 
 			Spacing = 8;
-			Proportions.Add(new Proportion
-			{
-				Type = Myra.Graphics2D.UI.ProportionType.Auto,
-			});
-			Proportions.Add(new Proportion
-			{
-				Type = Myra.Graphics2D.UI.ProportionType.Fill,
-			});
 			Widgets.Add(_mainMenu);
 			Widgets.Add(horizontalSplitPane1);
 		}

samples/Myra.Samples.Silk.NET/AllWidgets.Generated.cs

@@ -399,17 +399,9 @@ private void BuildUI()
 			var horizontalSplitPane1 = new HorizontalSplitPane();
 			horizontalSplitPane1.Widgets.Add(scrollViewer1);
 			horizontalSplitPane1.Widgets.Add(verticalSplitPane1);
+			StackPanel.SetProportionType(horizontalSplitPane1, ProportionType.Fill);
 
-
 			Spacing = 8;
-			Proportions.Add(new Proportion
-			{
-				Type = Myra.Graphics2D.UI.ProportionType.Auto,
-			});
-			Proportions.Add(new Proportion
-			{
-				Type = Myra.Graphics2D.UI.ProportionType.Fill,
-			});
 			Widgets.Add(_mainMenu);
 			Widgets.Add(horizontalSplitPane1);
 		}

samples/Myra.Samples.TextRendering/UI/MainPanel.Generated.cs

@@ -77,7 +77,7 @@ private void BuildUI()
 			label4.Text = "0.1";
 
 			_sliderScale = new HorizontalSlider();
-			_sliderScale.Minimum = 0.1;
+			_sliderScale.Minimum = 0.1f;
 			_sliderScale.Maximum = 10;
 			_sliderScale.Value = 1;
 			_sliderScale.Width = 200;

src/Myra/Graphics2D/UI/ColorPicker/ColorPickerPanel.Generated.cs

@@ -1,4 +1,4 @@
-/* Generated by MyraPad at 10/23/2023 9:55:20 AM */
+/* Generated by MyraPad at 10/23/2023 10:53:19 AM */
 using Myra;
 using Myra.Graphics2D;
 using Myra.Graphics2D.TextureAtlases;

src/Myra/Graphics2D/UI/Containers/StackPanel.cs

@@ -1,14 +1,12 @@
 using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
 using System.Xml.Serialization;
-
-#if MONOGAME || FNA
-using Microsoft.Xna.Framework;
 using Myra.Attributes;
 using Myra.MML;
 
+#if MONOGAME || FNA
+using Microsoft.Xna.Framework;
 #elif STRIDE
 using Stride.Core.Mathematics;
 #else

src/Myra/Graphics2D/UI/DebugOptionsWindow.Generated.cs

@@ -1,4 +1,4 @@
-/* Generated by MyraPad at 10/23/2023 9:55:38 AM */
+/* Generated by MyraPad at 10/23/2023 10:53:36 AM */
 using Myra;
 using Myra.Graphics2D;
 using Myra.Graphics2D.TextureAtlases;
@@ -52,7 +52,6 @@ private void BuildUI()
 
 			Root = new VerticalStackPanel();
 			Root.Id = "Root";
-			StackPanel.SetProportionType(Root, Myra.Graphics2D.UI.ProportionType.Fill);
 			Root.Widgets.Add(_checkBoxWidgetFrames);
 			Root.Widgets.Add(_checkBoxKeyboardFocusedWidgetFrame);
 			Root.Widgets.Add(_checkBoxMouseInsideWidgetFrame);

src/Myra/Graphics2D/UI/File/FileDialog.Generated.cs

@@ -1,4 +1,4 @@
-/* Generated by MyraPad at 10/23/2023 9:55:29 AM */
+/* Generated by MyraPad at 10/23/2023 10:53:28 AM */
 using Myra;
 using Myra.Graphics2D;
 using Myra.Graphics2D.TextureAtlases;
@@ -100,12 +100,10 @@ private void BuildUI()
 
 			var verticalStackPanel1 = new VerticalStackPanel();
 			verticalStackPanel1.Spacing = 4;
-			StackPanel.SetProportionType(verticalStackPanel1, Myra.Graphics2D.UI.ProportionType.Fill);
 			verticalStackPanel1.Widgets.Add(horizontalStackPanel1);
 			verticalStackPanel1.Widgets.Add(_splitPane);
 			verticalStackPanel1.Widgets.Add(horizontalStackPanel2);
 
-
 			Title = "Open File...";
 			Left = 980;
 			Top = 464;

src/Myra/Graphics2D/UI/Properties/CollectionEditor.cs

@@ -20,12 +20,6 @@ public CollectionEditor(IList collection, Type type)
 			_type = type;
 
 			InternalChild = new VerticalStackPanel();
-
-			InternalChild.Proportions.Add(new Proportion(ProportionType.Auto));
-			InternalChild.Proportions.Add(new Proportion(ProportionType.Fill));
-			InternalChild.Proportions.Add(new Proportion(ProportionType.Auto));
-			InternalChild.Proportions.Add(new Proportion(ProportionType.Auto));
-
 			InternalChild.Widgets.Add(new HorizontalSeparator());
 
 			var splitPanel = new HorizontalSplitPane();
@@ -44,6 +38,7 @@ public CollectionEditor(IList collection, Type type)
 				_listItems.Items.Add(new ListItem(BuildItemText(item), null, item));
 			}
 
+			StackPanel.SetProportionType(_listItems, ProportionType.Fill);
 			splitPanel.Widgets.Add(_listItems);
 
 			_propertyGrid = new PropertyGrid();

src/Myra/Graphics2D/UI/Properties/PropertyGrid.cs

@@ -1000,7 +1000,6 @@ private Widget CreateAttributeFileEditor(Record record, bool hasSetter, FilePath
 			TextBox path = null;
 			if (attribute.ShowPath)
 			{
-				result.Proportions.Add(Proportion.Fill);
 				path = new TextBox
 				{
 					Readonly = true,
@@ -1012,11 +1011,10 @@ private Widget CreateAttributeFileEditor(Record record, bool hasSetter, FilePath
 					path.Text = value.ToString();
 				}
 
+				StackPanel.SetProportionType(path, ProportionType.Fill);
 				result.Widgets.Add(path);
 			}
 
-			result.Proportions.Add(Proportion.Auto);
-
 			var button = new TextButton
 			{
 				Text = "Change...",

src/Myra/Graphics2D/UI/Window.cs

@@ -69,7 +69,7 @@ public SpriteFontBase TitleFont
 
 		[Browsable(false)]
 		[XmlIgnore]
-		public Grid TitleGrid { get; private set; }
+		public HorizontalStackPanel TitlePanel { get; private set; }
 
 		[Browsable(false)]
 		[XmlIgnore]
@@ -99,6 +99,7 @@ public Widget Content
 
 				if (value != null)
 				{
+					StackPanel.SetProportionType(value, ProportionType.Fill);
 					InternalChild.Widgets.Insert(1, value);
 				}
 
@@ -170,32 +171,26 @@ public Window(string styleName = Stylesheet.DefaultStyleName)
 
 			InternalChild.Spacing = 8;
 
-			InternalChild.Proportions.Add(new Proportion(ProportionType.Auto));
-			InternalChild.Proportions.Add(new Proportion(ProportionType.Fill));
-
-			TitleGrid = new Grid
+			TitlePanel = new HorizontalStackPanel
 			{
-				ColumnSpacing = 8
+				Spacing = 8
 			};
-			DragHandle = TitleGrid;
-
-			TitleGrid.ColumnsProportions.Add(new Proportion(ProportionType.Fill));
-			TitleGrid.ColumnsProportions.Add(new Proportion(ProportionType.Auto));
+			DragHandle = TitlePanel;
 
 			_titleLabel = new Label();
-			TitleGrid.Widgets.Add(_titleLabel);
+			StackPanel.SetProportionType(_titleLabel, ProportionType.Fill);
+			TitlePanel.Widgets.Add(_titleLabel);
 
 			CloseButton = new ImageButton();
-			Grid.SetColumn(CloseButton, 1);
 
 			CloseButton.Click += (sender, args) =>
 			{
 				Close();
 			};
 
-			TitleGrid.Widgets.Add(CloseButton);
+			TitlePanel.Widgets.Add(CloseButton);
 
-			InternalChild.Widgets.Add(TitleGrid);
+			InternalChild.Widgets.Add(TitlePanel);
 
 			SetStyle(styleName);
 		}