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

Merge pull request #3343 from jlewin/design_tools

Browse source 
Restore non-descent behavior
This commit is contained in:
johnlewin 2018-05-22 19:00:49 -07:00 • committed by GitHub
commit 8ac83f3f9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CustomWidgets/TreeView/TreeNode.cs
View file

@ -206,7 +206,7 @@ namespace MatterHackers.MatterControl.CustomWidgets.TreeView
Selectable = false
});
};
TitleBar.AddChild(textWidget = new TextWidget(this.Text)
TitleBar.AddChild(textWidget = new TextWidget(this.Text, pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
{
Selectable = false,
AutoExpandBoundsToText = true,

8
PartPreviewWindow/SelectedObjectPanel.cs
View file

@ -273,18 +273,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var activeEditors = new List<(IObject3DEditor, IObject3D, string)>();
foreach (var child in selectedItem.DescendantsAndSelf())
foreach (var child in new[] { selectedItem })
{
if (ApplicationController.Instance.GetEditorsForType(child.GetType())?.FirstOrDefault() is IObject3DEditor editor)
{
activeEditors.Add((editor, child, child.Name));
}
// If the object is not persistable than don't show its details.
if(!child.Persistable)
{
break;
}
}
ShowObjectEditor(activeEditors, selectedItem);