diff --git a/Launcher/Launcher.csproj b/Launcher/Launcher.csproj index e5152ddfc..9fac6662c 100644 --- a/Launcher/Launcher.csproj +++ b/Launcher/Launcher.csproj @@ -8,7 +8,7 @@ True - + all diff --git a/MatterControl.Printing/MatterControl.Printing.csproj b/MatterControl.Printing/MatterControl.Printing.csproj index 9fb4cc09a..86322eb9e 100644 --- a/MatterControl.Printing/MatterControl.Printing.csproj +++ b/MatterControl.Printing/MatterControl.Printing.csproj @@ -12,7 +12,7 @@ - + diff --git a/MatterControl.SLA/MatterControl.SLA.csproj b/MatterControl.SLA/MatterControl.SLA.csproj index 74eaf264e..3a3070505 100644 --- a/MatterControl.SLA/MatterControl.SLA.csproj +++ b/MatterControl.SLA/MatterControl.SLA.csproj @@ -12,7 +12,7 @@ - + diff --git a/MatterControl.Winforms/MatterControl.Winforms.csproj b/MatterControl.Winforms/MatterControl.Winforms.csproj index aa40578a6..f85b3ff07 100644 --- a/MatterControl.Winforms/MatterControl.Winforms.csproj +++ b/MatterControl.Winforms/MatterControl.Winforms.csproj @@ -28,7 +28,7 @@ - + all diff --git a/MatterControl.csproj b/MatterControl.csproj index 7df901ecd..341609bb4 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -103,7 +103,7 @@ 1.0.2-beta1 - + all diff --git a/MatterControlLib/DialogPages/StartupPage.cs b/MatterControlLib/DialogPages/StartupPage.cs index 81618d9b0..984ec122e 100644 --- a/MatterControlLib/DialogPages/StartupPage.cs +++ b/MatterControlLib/DialogPages/StartupPage.cs @@ -103,12 +103,14 @@ namespace MatterHackers.MatterControl var wordWidth = bounds.Width * .8; graphics = pulseImage.NewGraphics2D(); graphics.ImageRenderQuality = Graphics2D.TransformQuality.Best; - graphics.RenderMaxSize(pulseWord, pulseImage.Width / 2 - wordWidth / 2, margin, wordWidth, bounds.Height, out _); + graphics.RenderMaxSize(pulseWord, new Vector2(pulseImage.Width / 2 - wordWidth / 2, margin), new Vector2(wordWidth, bounds.Height)); var pulseLogo = StaticData.Instance.LoadIcon("pulse_logo.png").SetToColor(theme.TextColor); var logoWidth = bounds.Width * .5; graphics = pulseImage.NewGraphics2D(); graphics.ImageRenderQuality = Graphics2D.TransformQuality.Best; - graphics.RenderMaxSize(pulseLogo, pulseImage.Width / 2 - logoWidth / 2, pulseImage.Height * .42, logoWidth, bounds.Height, out _, preScale: false); + graphics.RenderMaxSize(pulseLogo, + new Vector2(pulseImage.Width / 2 - logoWidth / 2, pulseImage.Height * .42), + new Vector2(logoWidth, bounds.Height)); ThemedIconButton lastButton = null; buttonRow.AddChild(AddButtonText(lastButton = new ThemedIconButton(pulseImage, theme) { @@ -130,7 +132,7 @@ namespace MatterHackers.MatterControl var imageWidth = bounds.Width * .8; var printerIcon = StaticData.Instance.LoadIcon(iconFile).CropToVisible().SetToColor(theme.TextColor); var offset = pulseImage.Width / 2 - imageWidth / 2; - graphics.RenderMaxSize(printerIcon, offset, offset, imageWidth, bounds.Height, out _); + graphics.RenderMaxSize(printerIcon, new Vector2(offset, offset), new Vector2(imageWidth, bounds.Height)); return printerImage; } diff --git a/MatterControlLib/MatterControlLib.csproj b/MatterControlLib/MatterControlLib.csproj index d7db990d1..b586235d1 100644 --- a/MatterControlLib/MatterControlLib.csproj +++ b/MatterControlLib/MatterControlLib.csproj @@ -112,7 +112,7 @@ - + diff --git a/PrinterDriverInstaller/InfInstaller.csproj b/PrinterDriverInstaller/InfInstaller.csproj index fbe5dcf5c..9aa6366c1 100644 --- a/PrinterDriverInstaller/InfInstaller.csproj +++ b/PrinterDriverInstaller/InfInstaller.csproj @@ -8,7 +8,7 @@ - + all diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index ecc289e5b..7e79fdb5d 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit ecc289e5b6d9f43be6a0d1bd2d0d7ca4ada1cf33 +Subproject commit 7e79fdb5d6d0ff90eb5d24f84716c62e5fb048df diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 8d9c41fda..fd09e961b 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 8d9c41fda05ae25a84ba5e3483255fb4b4f040b4 +Subproject commit fd09e961bc6c5d5c104cc093ef303fd591b960f2 diff --git a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj index 0f9f2ff2e..e5bc80097 100644 --- a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj +++ b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj @@ -14,11 +14,11 @@ $(AssemblyName) - + - + all diff --git a/Tests/MatterControl.Tests/MatterControl.Tests.csproj b/Tests/MatterControl.Tests/MatterControl.Tests.csproj index fabd857e1..b14ae3a9b 100644 --- a/Tests/MatterControl.Tests/MatterControl.Tests.csproj +++ b/Tests/MatterControl.Tests/MatterControl.Tests.csproj @@ -39,11 +39,11 @@ - + - + all