From bd74891141ab1af818e7d5ef14a2004aa6141ca8 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 22 May 2018 18:34:57 -0700 Subject: [PATCH 1/2] Restore non-descent behavior --- PartPreviewWindow/SelectedObjectPanel.cs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/PartPreviewWindow/SelectedObjectPanel.cs b/PartPreviewWindow/SelectedObjectPanel.cs index cecde04eb..3046e2cfb 100644 --- a/PartPreviewWindow/SelectedObjectPanel.cs +++ b/PartPreviewWindow/SelectedObjectPanel.cs @@ -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); From 8798c23931829741e77e996aa43f301a35d4c3f3 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 22 May 2018 18:36:00 -0700 Subject: [PATCH 2/2] Use theme colors --- CustomWidgets/TreeView/TreeNode.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CustomWidgets/TreeView/TreeNode.cs b/CustomWidgets/TreeView/TreeNode.cs index d95615a95..044508840 100644 --- a/CustomWidgets/TreeView/TreeNode.cs +++ b/CustomWidgets/TreeView/TreeNode.cs @@ -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,