From 784034f2c678a2021ea93f10ee9330dcf908a35d Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 16 Feb 2018 18:47:28 -0800 Subject: [PATCH] Simplify --- PartPreviewWindow/PartTabPage.cs | 2 +- PartPreviewWindow/SelectedObjectPanel.cs | 3 +-- PartPreviewWindow/View3D/View3DWidget.cs | 10 +--------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/PartPreviewWindow/PartTabPage.cs b/PartPreviewWindow/PartTabPage.cs index 134d02583..645bc6252 100644 --- a/PartPreviewWindow/PartTabPage.cs +++ b/PartPreviewWindow/PartTabPage.cs @@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.Padding = 0; bool isPrinterType = this is PrinterTabPage; - + viewControls3D = new ViewControls3D(sceneContext, theme, sceneContext.Scene.UndoBuffer, isPrinterType) { //BackgroundColor = new Color(0, 0, 0, theme.OverlayAlpha), diff --git a/PartPreviewWindow/SelectedObjectPanel.cs b/PartPreviewWindow/SelectedObjectPanel.cs index 5465c98e3..2fb1fc73e 100644 --- a/PartPreviewWindow/SelectedObjectPanel.cs +++ b/PartPreviewWindow/SelectedObjectPanel.cs @@ -260,8 +260,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // Enforce panel padding in sidebar foreach(var sectionWidget in scrollableContent.Children()) { - var contentPanel = sectionWidget.ContentPanel; - contentPanel.Padding = new BorderDouble(10, 10, 10, 0); + sectionWidget.ContentPanel.Padding = new BorderDouble(10, 10, 10, 0); } HashSet mappedEditors; diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 35c91fcd8..2048f976b 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -91,8 +91,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow public View3DWidget(PrinterConfig printer, BedConfig sceneContext, AutoRotate autoRotate, ViewControls3D viewControls3D, ThemeConfig theme, PartTabPage printerTabBase, MeshViewerWidget.EditorType editorType = MeshViewerWidget.EditorType.Part) { - var smallMarginButtonFactory = theme.SmallMarginButtonFactory; - this.sceneContext = sceneContext; this.printerTabPage = printerTabBase as PrinterTabPage; this.printer = printer; @@ -166,9 +164,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow SplitterWidth = theme.SplitterWidth, Visible = false, }; - - this.InteractionLayer.AddChild(selectedObjectContainer); selectedObjectContainer.AddChild(selectedObjectPanel); + this.InteractionLayer.AddChild(selectedObjectContainer); this.InteractionLayer.AddChild(new TumbleCubeControl(this.InteractionLayer) { @@ -420,11 +417,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - public bool DragingPart - { - get { return CurrentSelectInfo.DownOnPart; } - } - public void AddUndoOperation(IUndoRedoCommand operation) { scene.UndoBuffer.Add(operation);