From 40499b26319409077204d5572c6360f213c099b2 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 4 Aug 2017 21:29:30 -0700 Subject: [PATCH 1/3] Revise and reuse margin --- PartPreviewWindow/View3D/GeneralObject3DEditor.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/PartPreviewWindow/View3D/GeneralObject3DEditor.cs b/PartPreviewWindow/View3D/GeneralObject3DEditor.cs index 3ee66ac7c..73cf1002a 100644 --- a/PartPreviewWindow/View3D/GeneralObject3DEditor.cs +++ b/PartPreviewWindow/View3D/GeneralObject3DEditor.cs @@ -53,11 +53,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { this.view3DWidget = view3DWidget; this.item = item; - FlowLayoutWidget mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom); + + FlowLayoutWidget mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom) + { + Padding = new BorderDouble(right: 3) + }; FlowLayoutWidget behavior3DTypeButtons = new FlowLayoutWidget(); mainContainer.AddChild(behavior3DTypeButtons); + var buttonMargin = new BorderDouble(2, 5); + // put in the button for making the behavior solid Button solidButtonView = theme.ButtonFactory.Generate("Solid".Localize()); var solidBehaviorButton = new PopupButton(solidButtonView) @@ -70,7 +76,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow VAnchor = VAnchor.FitToChildren, BackgroundColor = RGBA_Bytes.White }, - Margin = new BorderDouble(0, 5) + Margin = buttonMargin }; solidButtonView.Click += (s, e) => { @@ -81,7 +87,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // put in the button for making the behavior a hole Button holeBehaviorButton = theme.ButtonFactory.Generate("Hole".Localize()); - holeBehaviorButton.Margin = new BorderDouble(0, 5); + holeBehaviorButton.Margin = buttonMargin; holeBehaviorButton.Click += (s, e) => { item.OutputType = PrintOutputTypes.Hole; @@ -92,7 +98,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // put in the button for making the behavior support Button supportBehaviorButton = theme.ButtonFactory.Generate("Support".Localize()); - supportBehaviorButton.Margin = new BorderDouble(0, 5); + supportBehaviorButton.Margin = buttonMargin; supportBehaviorButton.Click += (s, e) => { item.OutputType = PrintOutputTypes.Support; From bb515c759c6570c0816154d72d82662616dd7db4 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 4 Aug 2017 21:32:48 -0700 Subject: [PATCH 2/3] Move Slice button into left/primary region --- PartPreviewWindow/View3D/PrinterActionsBar.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PartPreviewWindow/View3D/PrinterActionsBar.cs b/PartPreviewWindow/View3D/PrinterActionsBar.cs index 544414646..810e84d8f 100644 --- a/PartPreviewWindow/View3D/PrinterActionsBar.cs +++ b/PartPreviewWindow/View3D/PrinterActionsBar.cs @@ -96,8 +96,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.AddChild(new PrintActionRow(buttonFactory, this, defaultMargin)); - this.AddChild(new HorizontalSpacer()); - var initialMargin = buttonFactory.Margin; var sliceButton = buttonFactory.Generate("Slice".Localize()); @@ -120,7 +118,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // Save any pending changes before starting the print await ApplicationController.Instance.ActiveView3DWidget.PersistPlateIfNeeded(); - + await SlicingQueue.SliceFileAsync(printItem, sliceProgressReporter); gcodeLoadCancellationTokenSource = new CancellationTokenSource(); @@ -152,6 +150,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.AddChild(sliceButton); + this.AddChild(new HorizontalSpacer()); + this.AddChild(new TemperatureWidgetExtruder(ApplicationController.Instance.Theme.MenuButtonFactory) { Margin = new BorderDouble(right: 10) From e5a28f507051c2e03597006961ed422ee8dc1dfe Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 4 Aug 2017 21:33:19 -0700 Subject: [PATCH 3/3] Add slight shade to buttons --- ControlElements/TextImageButtonFactory.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ControlElements/TextImageButtonFactory.cs b/ControlElements/TextImageButtonFactory.cs index fde0909d9..c653b41ca 100644 --- a/ControlElements/TextImageButtonFactory.cs +++ b/ControlElements/TextImageButtonFactory.cs @@ -686,7 +686,7 @@ namespace MatterHackers.MatterControl this.Normal = new ButtonOptionSection() { TextColor = ActiveTheme.Instance.PrimaryTextColor, - FillColor = new RGBA_Bytes(0, 0, 0, 0), + FillColor = new RGBA_Bytes(0, 0, 0, 20), BorderColor = new RGBA_Bytes(255, 255, 255, 0) };