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

Improved subtract selection rendering

Browse source 
does not modify the part colors only the rendering colors
Refactoring
This commit is contained in:
LarsBrubaker 2018-12-21 08:27:40 -08:00
parent 1b20984dd1
commit 201c9d1d65
8 changed files with 71 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
MatterControlLib/DesignTools/PublicPropertyEditor.cs
View file

@ -104,7 +104,7 @@ namespace MatterHackers.MatterControl.DesignTools
typeof(Color),
typeof(Vector2), typeof(Vector3),
typeof(DirectionVector), typeof(DirectionAxis),
typeof(ChildrenSelector),
typeof(SelectedChildren),
typeof(ImageBuffer),
typeof(List<string>)
};
@ -435,7 +435,7 @@ namespace MatterHackers.MatterControl.DesignTools
rowContainer.AddChild(row2);
}
else if (propertyValue is ChildrenSelector childSelector)
else if (propertyValue is SelectedChildren childSelector)
{
var showAsList = property.PropertyInfo.GetCustomAttributes(true).OfType<ShowAsListAttribute>().FirstOrDefault() != null;
if (showAsList)
@ -446,7 +446,7 @@ namespace MatterHackers.MatterControl.DesignTools
RegisterValueChanged(field,
(valueString) =>
{
var childrenSelector = new ChildrenSelector();
var childrenSelector = new SelectedChildren();
foreach (var child in valueString.Split(','))
{
childrenSelector.Add(child);
@ -608,7 +608,7 @@ namespace MatterHackers.MatterControl.DesignTools
return new ImageWidget(imageBuffer);
}
private static GuiWidget CreateSelector(ChildrenSelector childSelector, IObject3D parent, ThemeConfig theme)
private static GuiWidget CreateSelector(SelectedChildren childSelector, IObject3D parent, ThemeConfig theme)
{
GuiWidget tabContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
@ -618,16 +618,6 @@ namespace MatterHackers.MatterControl.DesignTools
{
using (child.RebuildLock())
{
if (!childSelector.Contains(child.ID)
|| tabContainer.HasBeenClosed)
{
child.Color = new Color(child.WorldColor(), 255);
}
else
{
child.Color = new Color(child.WorldColor(), 200);
}
if (selectionChanged)
{
child.Visible = true;