Update UILayout, MonoGame

mikeoliphant · Nov 15, 2024 · 6591436 · 6591436
1 parent 812dac1
commit 6591436
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/Dependencies/UILayout b/Dependencies/UILayout
diff --git a/StompboxAndroid/StompboxAndroid.csproj b/StompboxAndroid/StompboxAndroid.csproj
@@ -17,8 +17,8 @@
     <AndroidPackageFormat>apk</AndroidPackageFormat>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
-    <PackageReference Include="MonoGame.Framework.Android" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
+    <PackageReference Include="MonoGame.Framework.Android" Version="3.8.2.1105" />
   </ItemGroup>
   <Target Name="RestoreDotnetTools" BeforeTargets="Restore">
     <Message Text="Restoring dotnet tools" Importance="High" />

diff --git a/StompboxHost/StompboxHost.csproj b/StompboxHost/StompboxHost.csproj
@@ -13,8 +13,8 @@
 	<ItemGroup>
 		<PackageReference Include="AudioPlugSharp" Version="0.6.7" />
 		<PackageReference Include="AudioPlugSharpHost" Version="0.6.6" />
-		<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
-		<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+		<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.2.1105" />
+		<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\StompboxPlugin\StompboxPlugin.csproj" />

diff --git a/StompboxPlugin/StompboxPlugin.csproj b/StompboxPlugin/StompboxPlugin.csproj
@@ -15,14 +15,14 @@
 	<ItemGroup>
 		<PackageReference Include="AudioPlugSharp" Version="0.6.7" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-		<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
+		<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.2.1105" />
 		<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<TrimmerRootAssembly Include="Microsoft.Xna.Framework.Content.ContentTypeReader" Visible="false" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+		<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
 	</ItemGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 		<DefineConstants>TRACE;XNA</DefineConstants>

diff --git a/StompboxRemote/StompboxRemote.csproj b/StompboxRemote/StompboxRemote.csproj
@@ -19,8 +19,8 @@
     <DefineConstants>$(DefineConstants);STOMPBOXREMOTE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.2.1105" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Dependencies\UILayout\UILayout.MonoGame.WindowsDX\UILayout.MonoGame.WindowsDX.csproj" />

diff --git a/StompboxRemoteGL/StompboxRemoteGL.csproj b/StompboxRemoteGL/StompboxRemoteGL.csproj
@@ -25,8 +25,8 @@
     <EmbeddedResource Include="Icon.bmp" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.2.1105" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Dependencies\UILayout\UILayout.MonoGame.DesktopGL\UILayout.MonoGame.DesktopGL.csproj" />

diff --git a/StompboxShared/Interface/PluginInterface.cs b/StompboxShared/Interface/PluginInterface.cs
@@ -258,14 +258,14 @@ protected UIElement CreateControl(PluginParameter parameter)
             VerticalStack controlVStack = new VerticalStack()
             {
                 HorizontalAlignment = EHorizontalAlignment.Stretch,
-                VerticalAlignment = EVerticalAlignment.Stretch
+                VerticalAlignment = EVerticalAlignment.Stretch,
             };
 
             controlVStack.Children.Add(new TextBlock(parameter.Name)
             {
                 HorizontalAlignment = EHorizontalAlignment.Center,
                 TextColor = foregroundColor,
-                TextFont = Layout.Current.GetFont("SmallFont")
+                TextFont = Layout.Current.GetFont("SmallFont"),
             });
 
             Dock controlDock = new Dock() { HorizontalAlignment = EHorizontalAlignment.Stretch, VerticalAlignment = EVerticalAlignment.Center };
+2 −2		ImageSheetProcessor/ImageSheetProcessor.csproj
+2 −2		MonoDesktopGLTest/MonoDesktopGLTest.csproj
+2 −2		MonoGameTest/MonoGameTest.csproj
+1 −1		SkiaTest/SkiaTest.csproj
+1 −15		SkiaTestSDL/SkiaTestSDL.csproj
+2 −2		UILayout.MonoGame.DesktopGL/UILayout.MonoGame.DesktopGL.csproj
+3 −3		UILayout.MonoGame.WindowsDX/UILayout.MonoGame.WindowsDX.csproj
+16 −7		UILayout.MonoGame/MonoGameLayout.cs
+3 −3		UILayout.Skia.SDL/UILayout.Skia.SDL.csproj
+12 −11		UILayout.Skia.WPF/UILayout.Skia.WPF.csproj
+0 −15		UILayout.Skia/UILayout.Skia.csproj
+20 −0		UILayout.Skia/UILayout.Skia.projitems
+13 −0		UILayout.Skia/UILayout.Skia.shproj
+7 −7		UILayout.sln
+64 −0		UILayout/Layout.cs