nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4355 from jlewin/master

Browse source 
Ensure OffsetChanged event fires if unset
This commit is contained in:
johnlewin 2019-03-15 19:20:38 -07:00 • committed by GitHub
commit a93691aeb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControlLib/CustomWidgets/NozzleOffsetTemplateWidget.cs
View file

@ -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)

2
MatterControlLib/CustomWidgets/TreeView/TreeNode.cs
View file

@ -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),