From 50f0bfa8f26ca23c8cf7c0fbb00542deb0b99bd3 Mon Sep 17 00:00:00 2001 From: jlewin Date: Fri, 15 Mar 2019 13:42:56 -0700 Subject: [PATCH 1/2] Eliminate problematic side effects from Image setter - Issue MatterHackers/MCCentral#5155 Collection modified exception during startup --- MatterControlLib/CustomWidgets/TreeView/TreeNode.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs b/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs index 0c46b252c..1cfc93169 100644 --- a/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs +++ b/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs @@ -110,7 +110,7 @@ namespace MatterHackers.MatterControl.CustomWidgets { _image = new ImageBuffer(16, 16); - this.HighlightRegion.AddChild(imageWidget = new ImageWidget(this.Image) + this.HighlightRegion.AddChild(imageWidget = new ImageWidget(this.Image, listenForImageChanged: false) { VAnchor = VAnchor.Center, Margin = new BorderDouble(right: 4), From f07cedbde6279b25619a2c00ad370365e86afb1c Mon Sep 17 00:00:00 2001 From: jlewin Date: Fri, 15 Mar 2019 14:10:28 -0700 Subject: [PATCH 2/2] Ensure OffsetChanged event fires if unset - Issue MatterHackers/MCCentral#5165 allow for clicking on the center position of the xy calibration --- MatterControlLib/CustomWidgets/NozzleOffsetTemplateWidget.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MatterControlLib/CustomWidgets/NozzleOffsetTemplateWidget.cs b/MatterControlLib/CustomWidgets/NozzleOffsetTemplateWidget.cs index 00540cb71..9fc575761 100644 --- a/MatterControlLib/CustomWidgets/NozzleOffsetTemplateWidget.cs +++ b/MatterControlLib/CustomWidgets/NozzleOffsetTemplateWidget.cs @@ -36,7 +36,7 @@ namespace MatterHackers.MatterControl { public class NozzleOffsetTemplateWidget : FlowLayoutWidget { - private double _activeOffset; + private double? _activeOffset = null; private ThemeConfig theme; public event EventHandler OffsetChanged; @@ -99,7 +99,7 @@ namespace MatterHackers.MatterControl public double ActiveOffset { - get => _activeOffset; + get => _activeOffset ?? 0; set { if (value != _activeOffset)