From 8f1e2183e35b47d9befe2870b94fa95f97381fa6 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 5 Jan 2018 11:45:11 -0800 Subject: [PATCH] Full height selection panel --- PartPreviewWindow/SelectedObjectPanel.cs | 17 ++++++++++++++--- PartPreviewWindow/View3D/View3DWidget.cs | 4 ++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/PartPreviewWindow/SelectedObjectPanel.cs b/PartPreviewWindow/SelectedObjectPanel.cs index 2be9bd74f..0bc2e5c42 100644 --- a/PartPreviewWindow/SelectedObjectPanel.cs +++ b/PartPreviewWindow/SelectedObjectPanel.cs @@ -120,13 +120,24 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; behavior3DTypeButtons.AddChild(editButton); - this.AddChild(editorPanel = new FlowLayoutWidget(FlowDirection.TopToBottom) + editorPanel = new FlowLayoutWidget(FlowDirection.TopToBottom) { - Name = "editorPanel", HAnchor = HAnchor.Stretch, VAnchor = VAnchor.Fit, + }; + + var scrollable = new ScrollableWidget(true) + { + Name = "editorPanel", Margin = new BorderDouble(top: 10), - }); + HAnchor = HAnchor.Stretch, + VAnchor = VAnchor.Stretch, + }; + + scrollable.AddChild(editorPanel); + scrollable.ScrollArea.HAnchor = HAnchor.Stretch; + + this.AddChild(scrollable); HashSet mappedEditors; objectEditorsByType = new Dictionary>(); diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 09dc66894..9a8844b10 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -361,14 +361,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow selectedObjectPanel = new SelectedObjectPanel(this, this.Scene, theme, printer) { BackgroundColor = theme.InteractionLayerOverlayColor, - VAnchor = VAnchor.Top | VAnchor.Fit, + VAnchor = VAnchor.Stretch, HAnchor = HAnchor.Left | HAnchor.Fit, }; selectedObjectContainer = new ResizeContainer(selectedObjectPanel) { Width = 200, - VAnchor = VAnchor.Fit | VAnchor.Top, + VAnchor = VAnchor.Stretch, HAnchor = HAnchor.Right, SpliterBarColor = theme.SplitterBackground, SplitterWidth = theme.SplitterWidth,