From 5bbe55053963b00fea03f29fdf4a5b5b9f1e2fc7 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Mon, 18 Dec 2017 17:27:28 -0800 Subject: [PATCH] Change typename to reflect new shared platform role --- ApplicationView/ApplicationController.cs | 2 +- ApplicationView/WindowsPlatformsFeatures.cs | 2 +- MatterControl.csproj | 2 +- Program.cs | 2 +- DesktopRootSystemWindow.cs => RootSystemWindow.cs | 4 ++-- .../MatterControl/MatterControlUtilities.cs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename DesktopRootSystemWindow.cs => RootSystemWindow.cs (99%) diff --git a/ApplicationView/ApplicationController.cs b/ApplicationView/ApplicationController.cs index 37aeef888..22047838b 100644 --- a/ApplicationView/ApplicationController.cs +++ b/ApplicationView/ApplicationController.cs @@ -1514,7 +1514,7 @@ namespace MatterHackers.MatterControl { timer = Stopwatch.StartNew(); - var systemWindow = new DesktopRootSystemWindow(width, height) + var systemWindow = new RootSystemWindow(width, height) { BackgroundColor = Color.DarkGray }; diff --git a/ApplicationView/WindowsPlatformsFeatures.cs b/ApplicationView/WindowsPlatformsFeatures.cs index bab8fc895..bb8ea3382 100644 --- a/ApplicationView/WindowsPlatformsFeatures.cs +++ b/ApplicationView/WindowsPlatformsFeatures.cs @@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl break; case "SHOW_MEMORY": - DesktopRootSystemWindow.ShowMemoryUsed = true; + RootSystemWindow.ShowMemoryUsed = true; break; } } diff --git a/MatterControl.csproj b/MatterControl.csproj index 0c126780d..13cd1f092 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -83,7 +83,6 @@ - @@ -152,6 +151,7 @@ + Form diff --git a/Program.cs b/Program.cs index 1c0366d9c..12ecf486d 100644 --- a/Program.cs +++ b/Program.cs @@ -50,7 +50,7 @@ namespace MatterHackers.MatterControl // Get startup bounds from MatterControl and construct system window //var systemWindow = new DesktopMainWindow(400, 200) - var (width, height) = DesktopRootSystemWindow.GetStartupBounds(); + var (width, height) = RootSystemWindow.GetStartupBounds(); Application.LoadRootWindow(width, height); } diff --git a/DesktopRootSystemWindow.cs b/RootSystemWindow.cs similarity index 99% rename from DesktopRootSystemWindow.cs rename to RootSystemWindow.cs index c865bfc86..2af1df47d 100644 --- a/DesktopRootSystemWindow.cs +++ b/RootSystemWindow.cs @@ -44,7 +44,7 @@ using MatterHackers.VectorMath; namespace MatterHackers.MatterControl { - public class DesktopRootSystemWindow : SystemWindow + public class RootSystemWindow : SystemWindow { private static Vector2 minSize { get; set; } = new Vector2(600, 600); @@ -60,7 +60,7 @@ namespace MatterHackers.MatterControl private bool exitDialogOpen = false; - public DesktopRootSystemWindow(double width, double height) + public RootSystemWindow(double width, double height) : base(width, height) { this.Name = "MatterControl"; diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index 604dec415..e9018e604 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -592,7 +592,7 @@ namespace MatterHackers.MatterControl.Tests.Automation AutomationRunner.TimeToMoveMouse = config.TimeToMoveMouse; AutomationRunner.UpDelaySeconds = config.MouseUpDelay; - rootSystemWindow = new DesktopRootSystemWindow(overrideWidth, overrideHeight); + rootSystemWindow = new RootSystemWindow(overrideWidth, overrideHeight); await AutomationRunner.ShowWindowAndExecuteTests( rootSystemWindow,