diff --git a/BrailleBuilder/View3DBrailleBuilder.cs b/BrailleBuilder/View3DBrailleBuilder.cs index e62f3cb74..0d9c7f15b 100644 --- a/BrailleBuilder/View3DBrailleBuilder.cs +++ b/BrailleBuilder/View3DBrailleBuilder.cs @@ -605,7 +605,7 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder // put in the word editing menu { - CheckBox expandWordOptions = expandMenuOptionFactory.GenerateCheckBoxButton("Word Edit".Localize(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); + CheckBox expandWordOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Word Edit".Localize(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); expandWordOptions.Margin = new BorderDouble(bottom: 2); buttonRightPanel.AddChild(expandWordOptions); diff --git a/MatterControl.csproj b/MatterControl.csproj index df7c08378..b8ca27d38 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -191,6 +191,7 @@ + diff --git a/PartPreviewWindow/BaseClasses/PartPreviewWidget.cs b/PartPreviewWindow/BaseClasses/PartPreviewWidget.cs index e31d8432c..d151fcadf 100644 --- a/PartPreviewWindow/BaseClasses/PartPreviewWidget.cs +++ b/PartPreviewWindow/BaseClasses/PartPreviewWidget.cs @@ -37,9 +37,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow protected readonly int ShortButtonHeight = 25; protected int SideBarButtonWidth; - protected TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory(); + public TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory(); protected TextImageButtonFactory checkboxButtonFactory = new TextImageButtonFactory(); - protected TextImageButtonFactory expandMenuOptionFactory = new TextImageButtonFactory(); + public TextImageButtonFactory ExpandMenuOptionFactory = new TextImageButtonFactory(); protected TextImageButtonFactory whiteButtonFactory = new TextImageButtonFactory(); protected ViewControls2D viewControls2D; @@ -78,14 +78,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow whiteButtonFactory.normalBorderColor = new RGBA_Bytes(ActiveTheme.Instance.PrimaryTextColor, 200); whiteButtonFactory.hoverBorderColor = new RGBA_Bytes(ActiveTheme.Instance.PrimaryTextColor, 200); - expandMenuOptionFactory.FixedWidth = SideBarButtonWidth; - expandMenuOptionFactory.normalTextColor = ActiveTheme.Instance.PrimaryTextColor; - expandMenuOptionFactory.hoverTextColor = ActiveTheme.Instance.PrimaryTextColor; - expandMenuOptionFactory.disabledTextColor = ActiveTheme.Instance.PrimaryTextColor; - expandMenuOptionFactory.pressedTextColor = ActiveTheme.Instance.PrimaryTextColor; - expandMenuOptionFactory.hoverFillColor = new RGBA_Bytes(255, 255, 255, 50); - expandMenuOptionFactory.pressedFillColor = new RGBA_Bytes(255, 255, 255, 50); - expandMenuOptionFactory.disabledFillColor = new RGBA_Bytes(255, 255, 255, 50); + ExpandMenuOptionFactory.FixedWidth = SideBarButtonWidth; + ExpandMenuOptionFactory.normalTextColor = ActiveTheme.Instance.PrimaryTextColor; + ExpandMenuOptionFactory.hoverTextColor = ActiveTheme.Instance.PrimaryTextColor; + ExpandMenuOptionFactory.disabledTextColor = ActiveTheme.Instance.PrimaryTextColor; + ExpandMenuOptionFactory.pressedTextColor = ActiveTheme.Instance.PrimaryTextColor; + ExpandMenuOptionFactory.hoverFillColor = new RGBA_Bytes(255, 255, 255, 50); + ExpandMenuOptionFactory.pressedFillColor = new RGBA_Bytes(255, 255, 255, 50); + ExpandMenuOptionFactory.disabledFillColor = new RGBA_Bytes(255, 255, 255, 50); checkboxButtonFactory.fontSize = 11; checkboxButtonFactory.FixedWidth = SideBarButtonWidth; diff --git a/PartPreviewWindow/View3D/MirrorControls.cs b/PartPreviewWindow/View3D/MirrorControls.cs new file mode 100644 index 000000000..4f420d6b3 --- /dev/null +++ b/PartPreviewWindow/View3D/MirrorControls.cs @@ -0,0 +1,132 @@ +/* +Copyright (c) 2014, Lars Brubaker +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation are those +of the authors and should not be interpreted as representing official policies, +either expressed or implied, of the FreeBSD Project. +*/ +//#define DoBooleanTest + +using MatterHackers.Agg; +using MatterHackers.Agg.UI; +using MatterHackers.Localizations; +using MatterHackers.VectorMath; +using System; +using System.Collections.Generic; + +namespace MatterHackers.MatterControl.PartPreviewWindow +{ + public partial class MirrorControls : FlowLayoutWidget + { + private CheckBox expandMirrorOptions; + private FlowLayoutWidget mirrorOptionContainer; + private View3DWidget view3DWidget; + + public MirrorControls(View3DWidget view3DWidget) + : base(FlowDirection.TopToBottom) + { + this.view3DWidget = view3DWidget; + + // put in the mirror options + { + expandMirrorOptions = view3DWidget.ExpandMenuOptionFactory.GenerateCheckBoxButton("Mirror".Localize().ToUpper(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); + expandMirrorOptions.Margin = new BorderDouble(bottom: 2); + this.AddChild(expandMirrorOptions); + + mirrorOptionContainer = new FlowLayoutWidget(FlowDirection.TopToBottom); + mirrorOptionContainer.HAnchor = HAnchor.ParentLeftRight; + mirrorOptionContainer.Visible = false; + this.AddChild(mirrorOptionContainer); + + AddMirrorControls(mirrorOptionContainer); + } + + expandMirrorOptions.CheckedStateChanged += expandMirrorOptions_CheckedStateChanged; + } + + private void AddMirrorControls(FlowLayoutWidget buttonPanel) + { + List mirrorControls = new List(); + + double oldFixedWidth = view3DWidget.textImageButtonFactory.FixedWidth; + view3DWidget.textImageButtonFactory.FixedWidth = view3DWidget.EditButtonHeight; + + FlowLayoutWidget buttonContainer = new FlowLayoutWidget(FlowDirection.LeftToRight); + buttonContainer.HAnchor = HAnchor.ParentLeftRight; + + Button mirrorXButton = view3DWidget.textImageButtonFactory.Generate("X", centerText: true); + buttonContainer.AddChild(mirrorXButton); + mirrorControls.Add(mirrorXButton); + mirrorXButton.Click += (object sender, EventArgs mouseEvent) => + { + if (view3DWidget.SelectedMeshGroupIndex != -1) + { + view3DWidget.SelectedMeshGroup.ReverseFaceEdges(); + view3DWidget.SelectedMeshGroupTransform = PlatingHelper.ApplyAtCenter(view3DWidget.SelectedMeshGroup, view3DWidget.SelectedMeshGroupTransform, Matrix4X4.CreateScale(-1, 1, 1)); + view3DWidget.PartHasBeenChanged(); + Invalidate(); + } + }; + + Button mirrorYButton = view3DWidget.textImageButtonFactory.Generate("Y", centerText: true); + buttonContainer.AddChild(mirrorYButton); + mirrorControls.Add(mirrorYButton); + mirrorYButton.Click += (object sender, EventArgs mouseEvent) => + { + if (view3DWidget.SelectedMeshGroupIndex != -1) + { + view3DWidget.SelectedMeshGroup.ReverseFaceEdges(); + view3DWidget.SelectedMeshGroupTransform = PlatingHelper.ApplyAtCenter(view3DWidget.SelectedMeshGroup, view3DWidget.SelectedMeshGroupTransform, Matrix4X4.CreateScale(1, -1, 1)); + view3DWidget.PartHasBeenChanged(); + Invalidate(); + } + }; + + Button mirrorZButton = view3DWidget.textImageButtonFactory.Generate("Z", centerText: true); + buttonContainer.AddChild(mirrorZButton); + mirrorControls.Add(mirrorZButton); + mirrorZButton.Click += (object sender, EventArgs mouseEvent) => + { + if (view3DWidget.SelectedMeshGroupIndex != -1) + { + view3DWidget.SelectedMeshGroup.ReverseFaceEdges(); + view3DWidget.SelectedMeshGroupTransform = PlatingHelper.ApplyAtCenter(view3DWidget.SelectedMeshGroup, view3DWidget.SelectedMeshGroupTransform, Matrix4X4.CreateScale(1, 1, -1)); + view3DWidget.PartHasBeenChanged(); + Invalidate(); + } + }; + buttonPanel.AddChild(buttonContainer); + buttonPanel.AddChild(view3DWidget.GenerateHorizontalRule()); + view3DWidget.textImageButtonFactory.FixedWidth = oldFixedWidth; + } + + private void expandMirrorOptions_CheckedStateChanged(object sender, EventArgs e) + { + if (mirrorOptionContainer.Visible != expandMirrorOptions.Checked) + { + mirrorOptionContainer.Visible = expandMirrorOptions.Checked; + } + } + } +} \ No newline at end of file diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 6adee7977..07952a47f 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -74,7 +74,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow public partial class View3DWidget : PartPreview3DWidget { - private readonly int EditButtonHeight = 44; + public readonly int EditButtonHeight = 44; private Action afterSaveCallback = null; private Button applyScaleButton; private List asyncMeshGroups = new List(); @@ -84,7 +84,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private bool editorThatRequestedSave = false; private FlowLayoutWidget enterEditButtonsContainer; private CheckBox expandMaterialOptions; - private CheckBox expandMirrorOptions; private CheckBox expandRotateOptions; private CheckBox expandScaleOptions; private CheckBox expandViewOptions; @@ -95,7 +94,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private FlowLayoutWidget materialOptionContainer; private List MeshGroupExtraData; public MeshSelectInfo CurrentSelectInfo { get; private set; } = new MeshSelectInfo(); - private FlowLayoutWidget mirrorOptionContainer; private OpenMode openMode; private bool partHasBeenEdited = false; private List pendingPartsToLoad = new List(); @@ -112,7 +110,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private EditableNumberDisplay[] sizeDisplay = new EditableNumberDisplay[3]; private Stopwatch timeSinceLastSpin = new Stopwatch(); private Stopwatch timeSinceReported = new Stopwatch(); - private Dictionary> transformControls = new Dictionary>(); private Matrix4X4 transformOnMouseDown = Matrix4X4.Identity; private CheckBox uniformScale; private EventHandler unregisterEvents; @@ -953,7 +950,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private void AddHandlers() { expandViewOptions.CheckedStateChanged += expandViewOptions_CheckedStateChanged; - expandMirrorOptions.CheckedStateChanged += expandMirrorOptions_CheckedStateChanged; if (expandMaterialOptions != null) { expandMaterialOptions.CheckedStateChanged += expandMaterialOptions_CheckedStateChanged; @@ -1017,66 +1013,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - private void AddMirrorControls(FlowLayoutWidget buttonPanel) - { - List mirrorControls = new List(); - transformControls.Add("Mirror", mirrorControls); - - textImageButtonFactory.FixedWidth = EditButtonHeight; - - FlowLayoutWidget buttonContainer = new FlowLayoutWidget(FlowDirection.LeftToRight); - buttonContainer.HAnchor = HAnchor.ParentLeftRight; - - Button mirrorXButton = textImageButtonFactory.Generate("X", centerText: true); - buttonContainer.AddChild(mirrorXButton); - mirrorControls.Add(mirrorXButton); - mirrorXButton.Click += (object sender, EventArgs mouseEvent) => - { - if (SelectedMeshGroupIndex != -1) - { - SelectedMeshGroup.ReverseFaceEdges(); - SelectedMeshGroupTransform = PlatingHelper.ApplyAtCenter(SelectedMeshGroup, SelectedMeshGroupTransform, Matrix4X4.CreateScale(-1, 1, 1)); - PartHasBeenChanged(); - Invalidate(); - } - }; - - Button mirrorYButton = textImageButtonFactory.Generate("Y", centerText: true); - buttonContainer.AddChild(mirrorYButton); - mirrorControls.Add(mirrorYButton); - mirrorYButton.Click += (object sender, EventArgs mouseEvent) => - { - if (SelectedMeshGroupIndex != -1) - { - SelectedMeshGroup.ReverseFaceEdges(); - SelectedMeshGroupTransform = PlatingHelper.ApplyAtCenter(SelectedMeshGroup, SelectedMeshGroupTransform, Matrix4X4.CreateScale(1, -1, 1)); - PartHasBeenChanged(); - Invalidate(); - } - }; - - Button mirrorZButton = textImageButtonFactory.Generate("Z", centerText: true); - buttonContainer.AddChild(mirrorZButton); - mirrorControls.Add(mirrorZButton); - mirrorZButton.Click += (object sender, EventArgs mouseEvent) => - { - if (SelectedMeshGroupIndex != -1) - { - SelectedMeshGroup.ReverseFaceEdges(); - SelectedMeshGroupTransform = PlatingHelper.ApplyAtCenter(SelectedMeshGroup, SelectedMeshGroupTransform, Matrix4X4.CreateScale(1, 1, -1)); - PartHasBeenChanged(); - Invalidate(); - } - }; - buttonPanel.AddChild(buttonContainer); - buttonPanel.AddChild(generateHorizontalRule()); - textImageButtonFactory.FixedWidth = 0; - } - private void AddRotateControls(FlowLayoutWidget buttonPanel) { List rotateControls = new List(); - transformControls.Add("Rotate".Localize(), rotateControls); textImageButtonFactory.FixedWidth = EditButtonHeight; @@ -1165,7 +1104,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } }; - buttonPanel.AddChild(generateHorizontalRule()); + buttonPanel.AddChild(GenerateHorizontalRule()); textImageButtonFactory.FixedWidth = 0; } @@ -1198,7 +1137,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private void AddScaleControls(FlowLayoutWidget buttonPanel) { List scaleControls = new List(); - transformControls.Add("Scale", scaleControls); // Put in the scale ratio edit field { @@ -1269,7 +1207,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow buttonPanel.AddChild(leftToRight); } - buttonPanel.AddChild(generateHorizontalRule()); + buttonPanel.AddChild(GenerateHorizontalRule()); } private bool AllowDragDrop() @@ -1474,7 +1412,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { BorderDouble buttonMargin = new BorderDouble(top: 3); - expandRotateOptions = expandMenuOptionFactory.GenerateCheckBoxButton("Rotate".Localize().ToUpper(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); + expandRotateOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Rotate".Localize().ToUpper(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); expandRotateOptions.Margin = new BorderDouble(bottom: 2); buttonRightPanel.AddChild(expandRotateOptions); @@ -1483,7 +1421,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow rotateOptionContainer.Visible = false; buttonRightPanel.AddChild(rotateOptionContainer); - expandScaleOptions = expandMenuOptionFactory.GenerateCheckBoxButton("Scale".Localize().ToUpper(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); + expandScaleOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Scale".Localize().ToUpper(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); expandScaleOptions.Margin = new BorderDouble(bottom: 2); buttonRightPanel.AddChild(expandScaleOptions); @@ -1492,24 +1430,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow scaleOptionContainer.Visible = false; buttonRightPanel.AddChild(scaleOptionContainer); - // put in the mirror options - { - expandMirrorOptions = expandMenuOptionFactory.GenerateCheckBoxButton("Mirror".Localize().ToUpper(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); - expandMirrorOptions.Margin = new BorderDouble(bottom: 2); - buttonRightPanel.AddChild(expandMirrorOptions); - - mirrorOptionContainer = new FlowLayoutWidget(FlowDirection.TopToBottom); - mirrorOptionContainer.HAnchor = HAnchor.ParentLeftRight; - mirrorOptionContainer.Visible = false; - buttonRightPanel.AddChild(mirrorOptionContainer); - - AddMirrorControls(mirrorOptionContainer); - } + buttonRightPanel.AddChild(new MirrorControls(this)); // put in the material options int numberOfExtruders = ActiveSliceSettings.Instance.ExtruderCount; - expandMaterialOptions = expandMenuOptionFactory.GenerateCheckBoxButton("Materials".Localize().ToUpper(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); + expandMaterialOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Materials".Localize().ToUpper(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); expandMaterialOptions.Margin = new BorderDouble(bottom: 2); if (numberOfExtruders > 1) @@ -1526,7 +1452,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // put in the view options { - expandViewOptions = expandMenuOptionFactory.GenerateCheckBoxButton("Display".Localize().ToUpper(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); + expandViewOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Display".Localize().ToUpper(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); expandViewOptions.Margin = new BorderDouble(bottom: 2); buttonRightPanel.AddChild(expandViewOptions); @@ -1701,21 +1627,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow materialOptionContainer.Visible = expandMaterialOptions.Checked; } - private void expandMirrorOptions_CheckedStateChanged(object sender, EventArgs e) - { - if (mirrorOptionContainer.Visible != expandMirrorOptions.Checked) - { - if (expandMirrorOptions.Checked == true) - { - expandScaleOptions.Checked = false; - expandRotateOptions.Checked = false; - expandViewOptions.Checked = false; - expandMaterialOptions.Checked = false; - } - mirrorOptionContainer.Visible = expandMirrorOptions.Checked; - } - } - private void expandRotateOptions_CheckedStateChanged(object sender, EventArgs e) { if (rotateOptionContainer.Visible != expandRotateOptions.Checked) @@ -1724,7 +1635,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { expandViewOptions.Checked = false; expandScaleOptions.Checked = false; - expandMirrorOptions.Checked = false; expandMaterialOptions.Checked = false; } rotateOptionContainer.Visible = expandRotateOptions.Checked; @@ -1739,7 +1649,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { expandViewOptions.Checked = false; expandRotateOptions.Checked = false; - expandMirrorOptions.Checked = false; expandMaterialOptions.Checked = false; } scaleOptionContainer.Visible = expandScaleOptions.Checked; @@ -1754,7 +1663,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { expandScaleOptions.Checked = false; expandRotateOptions.Checked = false; - expandMirrorOptions.Checked = false; expandMaterialOptions.Checked = false; } viewOptionContainer.Visible = expandViewOptions.Checked; @@ -1805,7 +1713,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow return false; } - private GuiWidget generateHorizontalRule() + public GuiWidget GenerateHorizontalRule() { GuiWidget horizontalRule = new GuiWidget(); horizontalRule.Height = 1; diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs index d3420f819..c97c595e6 100644 --- a/PartPreviewWindow/ViewGcodeBasic.cs +++ b/PartPreviewWindow/ViewGcodeBasic.cs @@ -386,7 +386,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow buttonRightPanel.Width = 200; { string label = "Model".Localize().ToUpper(); - expandModelOptions = expandMenuOptionFactory.GenerateCheckBoxButton(label, "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); + expandModelOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton(label, "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); expandModelOptions.Margin = new BorderDouble(bottom: 2); buttonRightPanel.AddChild(expandModelOptions); expandModelOptions.Checked = true; @@ -396,7 +396,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow //modelOptionsContainer.Visible = false; buttonRightPanel.AddChild(modelOptionsContainer); - expandDisplayOptions = expandMenuOptionFactory.GenerateCheckBoxButton("Display".Localize().ToUpper(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); + expandDisplayOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Display".Localize().ToUpper(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); expandDisplayOptions.Margin = new BorderDouble(bottom: 2); buttonRightPanel.AddChild(expandDisplayOptions); expandDisplayOptions.Checked = false; diff --git a/TextCreator/View3DTextCreator.cs b/TextCreator/View3DTextCreator.cs index 468272b96..3f2b75cbd 100644 --- a/TextCreator/View3DTextCreator.cs +++ b/TextCreator/View3DTextCreator.cs @@ -617,7 +617,7 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator // put in the word editing menu { - CheckBox expandWordOptions = expandMenuOptionFactory.GenerateCheckBoxButton("Word Edit".Localize(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); + CheckBox expandWordOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Word Edit".Localize(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); expandWordOptions.Margin = new BorderDouble(bottom: 2); buttonRightPanel.AddChild(expandWordOptions); @@ -690,7 +690,7 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator // put in the letter editing menu { - CheckBox expandLetterOptions = expandMenuOptionFactory.GenerateCheckBoxButton("Letter", "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); + CheckBox expandLetterOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Letter", "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png"); expandLetterOptions.Margin = new BorderDouble(bottom: 2); //buttonRightPanel.AddChild(expandLetterOptions);