From 523a218d476b72b49c4a7921fc239bc33c3e667d Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 3 Aug 2018 13:00:15 -0700 Subject: [PATCH] Use event pattern --- SlicerConfiguration/Slicer.cs | 2 +- .../UIFields/SurfacedEditorPage.cs | 8 ++++---- .../UIFields/SurfacedEditorsField.cs | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/SlicerConfiguration/Slicer.cs b/SlicerConfiguration/Slicer.cs index 8b1abec48..bead6fb40 100644 --- a/SlicerConfiguration/Slicer.cs +++ b/SlicerConfiguration/Slicer.cs @@ -261,7 +261,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration ActiveSliceSettings.Instance.SetValue("boolean_operations", mergeRules); - var matrixAndMeshArgs = new StringBuilder(); ; + var matrixAndMeshArgs = new StringBuilder(); foreach (var matrixAndFile in stlFileLocations) { var matrixString = ""; diff --git a/SlicerConfiguration/UIFields/SurfacedEditorPage.cs b/SlicerConfiguration/UIFields/SurfacedEditorPage.cs index 8628734e3..17c3e4fd3 100644 --- a/SlicerConfiguration/UIFields/SurfacedEditorPage.cs +++ b/SlicerConfiguration/UIFields/SurfacedEditorPage.cs @@ -41,9 +41,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { public class SurfacedEditorPage : DialogPage { + public event EventHandler ValueChanged; + private MHTextEditWidget editWidget; - public SurfacedEditorPage(UIField uiField, IObject3D selectedItem) + public SurfacedEditorPage(IObject3D selectedItem) { this.WindowTitle = "MatterControl - " + "Editor Selector".Localize(); this.HeaderText = "Surfaced Editor".Localize(); @@ -142,9 +144,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration var saveButton = theme.CreateDialogButton("Save".Localize()); saveButton.Click += (s, e) => { - uiField.SetValue( - editWidget.Text.Replace("\n", "\\n"), - userInitiated: true); + this.ValueChanged?.Invoke(this, null); this.DialogWindow.CloseOnIdle(); }; diff --git a/SlicerConfiguration/UIFields/SurfacedEditorsField.cs b/SlicerConfiguration/UIFields/SurfacedEditorsField.cs index ee25df9f8..dc77fc219 100644 --- a/SlicerConfiguration/UIFields/SurfacedEditorsField.cs +++ b/SlicerConfiguration/UIFields/SurfacedEditorsField.cs @@ -58,17 +58,17 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { if (sender is InlineStringEdit inlineEdit) { - var uifield = new TextField(); - uifield.Initialize(0); - uifield.ValueChanged += (s, e2) => - { - inlineEdit.Text = uifield.Value; - }; - - DialogWindow.Show(new SurfacedEditorPage(uifield, selectedItem) + var editorPage = new SurfacedEditorPage(selectedItem) { EditorString = inlineEdit.Text, - }); + }; + + editorPage.ValueChanged += (s, e2) => + { + inlineEdit.Text = editorPage.EditorString; + }; + + DialogWindow.Show(editorPage); } } }