From ff2adf51bc6095d164f37cc9ad3644c8cb9d54ba Mon Sep 17 00:00:00 2001
From: John Lewin <lewin76@gmail.com>
Date: Wed, 10 Jan 2018 22:44:45 -0800
Subject: [PATCH] Consolidate
 ManualPrinterControls/ManualPrinterControlsDesktop

---
 PrinterControls/ManualPrinterControls.cs | 49 +++++++++---------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/PrinterControls/ManualPrinterControls.cs b/PrinterControls/ManualPrinterControls.cs
index 54e67f297..5eb3e225d 100644
--- a/PrinterControls/ManualPrinterControls.cs
+++ b/PrinterControls/ManualPrinterControls.cs
@@ -45,39 +45,11 @@ namespace MatterHackers.MatterControl
 		}
 	}
 
-	public class ManualPrinterControls : GuiWidget
+	public class ManualPrinterControls : ScrollableWidget
 	{
-		static public RootedObjectEventHandler AddPluginControls = new RootedObjectEventHandler();
-
+		public static RootedObjectEventHandler AddPluginControls = new RootedObjectEventHandler();
 		private static bool pluginsQueuedToAdd = false;
-		private PrinterConfig printer;
 
-		public ManualPrinterControls(PrinterConfig printer)
-		{
-			this.printer = printer;
-			this.BackgroundColor = ApplicationController.Instance.Theme.TabBodyBackground;
-			this.AnchorAll();
-			this.AddChild(new ManualPrinterControlsDesktop(printer));
-		}
-
-		public override void OnLoad(EventArgs args)
-		{
-			if (!pluginsQueuedToAdd && printer.Settings.GetValue(SettingsKey.include_firmware_updater) == "Simple Arduino")
-			{
-				UiThread.RunOnIdle(() =>
-				{
-					AddPluginControls.CallEvents(this, null);
-					pluginsQueuedToAdd = false;
-				});
-				pluginsQueuedToAdd = true;
-			}
-
-			base.OnLoad(args);
-		}
-	}
-
-	public class ManualPrinterControlsDesktop : ScrollableWidget
-	{
 		private GuiWidget fanControlsContainer;
 		private GuiWidget macroControlsContainer;
 		private GuiWidget tuningAdjustmentControlsContainer;
@@ -89,7 +61,7 @@ namespace MatterHackers.MatterControl
 		private PrinterConfig printer;
 		private FlowLayoutWidget column;
 
-		public ManualPrinterControlsDesktop(PrinterConfig printer)
+		public ManualPrinterControls(PrinterConfig printer)
 		{
 			this.theme = ApplicationController.Instance.Theme;
 
@@ -158,6 +130,21 @@ namespace MatterHackers.MatterControl
 			return sectionWidget.ContentPanel;
 		}
 
+		public override void OnLoad(EventArgs args)
+		{
+			if (!pluginsQueuedToAdd && printer.Settings.GetValue(SettingsKey.include_firmware_updater) == "Simple Arduino")
+			{
+				UiThread.RunOnIdle(() =>
+				{
+					AddPluginControls.CallEvents(this, null);
+					pluginsQueuedToAdd = false;
+				});
+				pluginsQueuedToAdd = true;
+			}
+
+			base.OnLoad(args);
+		}
+
 		public override void OnClosed(ClosedEventArgs e)
 		{
 			unregisterEvents?.Invoke(this, null);