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

Change the Invalidate Type to flags

Browse source 
remove undo buffer from invalidate type
This commit is contained in:
Lars Brubaker 2019-01-28 14:19:40 -08:00
parent 0d74b4b5d8
commit f0728e0610
56 changed files with 283 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

19
MatterControlLib/DesignTools/Primitives/TextObject3D.cs
View file

@ -58,7 +58,7 @@ namespace MatterHackers.MatterControl.DesignTools
{
var item = new TextObject3D();
item.Invalidate(new InvalidateArgs(null, InvalidateType.Content, null));
item.Invalidate(new InvalidateArgs(null, InvalidateType.Children));
return item;
}
@ -89,23 +89,23 @@ namespace MatterHackers.MatterControl.DesignTools
public override async void OnInvalidate(InvalidateArgs invalidateType)
{
if ((invalidateType.InvalidateType == InvalidateType.Content
|| invalidateType.InvalidateType == InvalidateType.Matrix
|| invalidateType.InvalidateType == InvalidateType.Mesh)
if ((invalidateType.InvalidateType.HasFlag(InvalidateType.Children)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateType.InvalidateType.HasFlag(InvalidateType.Mesh))
&& invalidateType.Source != this
&& !RebuildLocked)
{
await Rebuild();
invalidateType = new InvalidateArgs(this, InvalidateType.Content, invalidateType.UndoBuffer);
}
else if (invalidateType.InvalidateType == InvalidateType.Properties
else if (invalidateType.InvalidateType.HasFlag(InvalidateType.Properties)
&& invalidateType.Source == this)
{
await Rebuild();
invalidateType = new InvalidateArgs(this, InvalidateType.Content, invalidateType.UndoBuffer);
}
base.OnInvalidate(invalidateType);
else
{
base.OnInvalidate(invalidateType);
}
}
public override Task Rebuild()
@ -153,6 +153,7 @@ namespace MatterHackers.MatterControl.DesignTools
}
rebuildLock.Dispose();
base.OnInvalidate(new InvalidateArgs(this, InvalidateType.Children));
return Task.CompletedTask;
});
}