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

making sure we don't re-enter this.OnInvalidate unless explicitly for properties

Browse source 
issue: MatterHackers/MCCentral#4965
Rebuild should directly call base.OnInvalidate to prevent re-entering this.OnInvalidate
This commit is contained in:
Lars Brubaker 2019-02-13 15:45:33 -08:00
parent 5617739302
commit 563bd1a3e7
31 changed files with 48 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MatterControlLib/DesignTools/Operations/TranslateObject3D.cs
View file

@ -76,7 +76,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
#endregion // editable properties
public override void OnInvalidate(InvalidateArgs invalidateType)
public override async void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Children)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
@ -84,12 +84,12 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
&& invalidateType.Source != this
&& !RebuildLocked)
{
Rebuild();
await Rebuild();
}
else if (invalidateType.InvalidateType.HasFlag(InvalidateType.Properties)
&& invalidateType.Source == this)
{
Rebuild();
await Rebuild();
}
else
{
@ -107,7 +107,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
ItemWithTransform.Matrix = Matrix4X4.CreateTranslation(Translation);
}
Invalidate(InvalidateType.Matrix);
Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Matrix));
return Task.CompletedTask;
}
}