From 93b6fa049cca365aac8582a467e0fbdffe127f01 Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Mon, 27 Oct 2014 17:20:32 -0700 Subject: [PATCH] Making the 2d 3d button not show in gcode view until it is needed. --- PartPreviewWindow/ViewControls2D.cs | 3 --- PartPreviewWindow/ViewGcodeBasic.cs | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/PartPreviewWindow/ViewControls2D.cs b/PartPreviewWindow/ViewControls2D.cs index a4f61857b..9462ab7d5 100644 --- a/PartPreviewWindow/ViewControls2D.cs +++ b/PartPreviewWindow/ViewControls2D.cs @@ -10,7 +10,6 @@ using MatterHackers.MatterControl; namespace MatterHackers.MatterControl.PartPreviewWindow { - public class ViewControlsBase : FlowLayoutWidget { protected int buttonHeight; @@ -32,7 +31,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow public RadioButton translateButton; public RadioButton scaleButton; - public ViewControls2D() { if (ActiveTheme.Instance.DisplayMode == ActiveTheme.ApplicationDisplayType.Touchscreen) @@ -82,7 +80,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow BackgroundColor = new RGBA_Bytes(0, 0, 0, 120); - iconTextImageButtonFactory.FixedHeight = buttonHeight; iconTextImageButtonFactory.FixedWidth = buttonHeight; diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs index 8c04b21bf..f66864abe 100644 --- a/PartPreviewWindow/ViewGcodeBasic.cs +++ b/PartPreviewWindow/ViewGcodeBasic.cs @@ -259,9 +259,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow viewControls3D.Visible = false; viewControlsToggle = new ViewControlsToggle (); + viewControlsToggle.HAnchor = Agg.UI.HAnchor.ParentRight; AddChild (viewControlsToggle); + viewControlsToggle.Visible = false; - //viewControls3D.translateButton.ClickButton(null); // move things into the right place and scale @@ -807,6 +808,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { CreateOptionsContent(); buttonRightPanel.Visible = true; + viewControlsToggle.Visible = true; CloseIfNotNull(setLayerWidget); setLayerWidget = new SetLayerWidget(gcodeViewWidget);