nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify

Browse source
This commit is contained in:
John Lewin 2018-02-16 18:47:28 -08:00
parent c311f58fcf
commit 784034f2c6
3 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PartPreviewWindow/PartTabPage.cs
View file

@ -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),

3
PartPreviewWindow/SelectedObjectPanel.cs
View file

@ -260,8 +260,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// Enforce panel padding in sidebar
foreach(var sectionWidget in scrollableContent.Children<SectionWidget>())
{
var contentPanel = sectionWidget.ContentPanel;
contentPanel.Padding = new BorderDouble(10, 10, 10, 0);
sectionWidget.ContentPanel.Padding = new BorderDouble(10, 10, 10, 0);
}
HashSet<IObject3DEditor> mappedEditors;

10
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -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);