From 2fafdccae554b4b8e0aa35bac77b20d4e1af29b6 Mon Sep 17 00:00:00 2001
From: LarsBrubaker <larsbrubaker@gmail.com>
Date: Sun, 7 Jun 2020 23:09:01 -0700
Subject: [PATCH] making design tabs save width

---
 .../ApplicationView/PrinterViewState.cs       | 19 -------------------
 .../PartPreviewWindow/PrinterTabPage.cs       |  4 ++--
 .../PartPreviewWindow/View3D/View3DWidget.cs  |  7 ++-----
 .../SettingsManagement/UserSettings.cs        | 19 +++++++++++++++++++
 Submodules/MatterSlice                        |  2 +-
 Submodules/agg-sharp                          |  2 +-
 6 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/MatterControlLib/ApplicationView/PrinterViewState.cs b/MatterControlLib/ApplicationView/PrinterViewState.cs
index 1a9f8af86..c06bf6ba5 100644
--- a/MatterControlLib/ApplicationView/PrinterViewState.cs
+++ b/MatterControlLib/ApplicationView/PrinterViewState.cs
@@ -167,25 +167,6 @@ namespace MatterHackers.MatterControl
 			}
 		}
 
-		public double SelectedObjectPanelWidth
-		{
-			get
-			{
-				if (double.TryParse(UserSettings.Instance.get(UserSettingsKey.SelectedObjectPanelWidth), out double controlWidth))
-				{
-					return Math.Max(controlWidth, 150);
-				}
-
-				return 200;
-			}
-
-			set
-			{
-				var minimumValue = Math.Max(value, 150);
-				UserSettings.Instance.set(UserSettingsKey.SelectedObjectPanelWidth, minimumValue.ToString());
-			}
-		}
-
 		public bool SlicingItem { get; set; }
 	}
 }
\ No newline at end of file
diff --git a/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs b/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs
index dc47dd92c..687bc35ce 100644
--- a/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs
+++ b/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs
@@ -164,7 +164,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 			gcodeContainer = new VerticalResizeContainer(theme, GrabBarSide.Left)
 			{
-				Width = printer?.ViewState.SelectedObjectPanelWidth ?? 200,
+				Width = UserSettings.Instance.SelectedObjectPanelWidth,
 				VAnchor = VAnchor.Stretch,
 				HAnchor = HAnchor.Absolute,
 				SplitterBarColor = theme.SplitterBackground,
@@ -177,7 +177,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			{
 				if (printer != null)
 				{
-					printer.ViewState.SelectedObjectPanelWidth = gcodeContainer.Width;
+					UserSettings.Instance.SelectedObjectPanelWidth = gcodeContainer.Width;
 				}
 			};
 
diff --git a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
index dd05f96a8..ad0c9733e 100644
--- a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
+++ b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
@@ -158,7 +158,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 			modelViewSidePanel = new VerticalResizeContainer(theme, GrabBarSide.Left)
 			{
-				Width = printer?.ViewState.SelectedObjectPanelWidth ?? 250,
+				Width = UserSettings.Instance.SelectedObjectPanelWidth,
 				VAnchor = VAnchor.Stretch,
 				HAnchor = HAnchor.Absolute,
 				BackgroundColor = theme.InteractionLayerOverlayColor,
@@ -467,10 +467,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 		private void ModelViewSidePanel_Resized(object sender, EventArgs e)
 		{
-			if (this.Printer != null)
-			{
-				this.Printer.ViewState.SelectedObjectPanelWidth = selectedObjectPanel.Width;
-			}
+			UserSettings.Instance.SelectedObjectPanelWidth = selectedObjectPanel.Width;
 		}
 
 		private void UpdateRenderView(object sender, EventArgs e)
diff --git a/MatterControlLib/SettingsManagement/UserSettings.cs b/MatterControlLib/SettingsManagement/UserSettings.cs
index c6e0fc5dd..d7d04300a 100644
--- a/MatterControlLib/SettingsManagement/UserSettings.cs
+++ b/MatterControlLib/SettingsManagement/UserSettings.cs
@@ -265,5 +265,24 @@ namespace MatterHackers.MatterControl
 				return string.IsNullOrWhiteSpace(showContainers) || showContainers == "1";
 			}
 		}
+
+		public double SelectedObjectPanelWidth
+		{
+			get
+			{
+				if (double.TryParse(UserSettings.Instance.get(UserSettingsKey.SelectedObjectPanelWidth), out double controlWidth))
+				{
+					return Math.Max(controlWidth, 150);
+				}
+
+				return 200;
+			}
+
+			set
+			{
+				var minimumValue = Math.Max(value, 150);
+				UserSettings.Instance.set(UserSettingsKey.SelectedObjectPanelWidth, minimumValue.ToString());
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice
index 9222f0ec0..1ae7c91cf 160000
--- a/Submodules/MatterSlice
+++ b/Submodules/MatterSlice
@@ -1 +1 @@
-Subproject commit 9222f0ec0f438ea800d8a3a104dfd8707895810a
+Subproject commit 1ae7c91cfac9c80a40662c23503584ef13136012
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index eeb34ce68..7264ed51f 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit eeb34ce683872e34e488c6301335de8c011b4c63
+Subproject commit 7264ed51faa05febd6f3ef49c114c3e5ebbfb901