From 77ba63fd82c287a2dd95c2bcf7112a4d4fed9ea0 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Sat, 23 Jun 2018 07:05:26 -0700 Subject: [PATCH] Remove scrollable from ResizableSectionWidget, wrap in caller --- PartPreviewWindow/ResizableSectionWidget.cs | 16 +++------------- PartPreviewWindow/SelectedObjectPanel.cs | 11 ++++++++++- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/PartPreviewWindow/ResizableSectionWidget.cs b/PartPreviewWindow/ResizableSectionWidget.cs index 1e8ec0bc1..0276e55d2 100644 --- a/PartPreviewWindow/ResizableSectionWidget.cs +++ b/PartPreviewWindow/ResizableSectionWidget.cs @@ -51,29 +51,19 @@ namespace MatterHackers.MatterControl.PartPreviewWindow VAnchor = VAnchor.Absolute, Height = initialHeight }; - this.ResizeContainer.Resized += (s, e) => { this.Resized?.Invoke(this, null); }; - - // Add container used to host the current specialized editor for the selection - var scrollableWidget = new ScrollableWidget(true) - { - HAnchor = HAnchor.Stretch, - VAnchor = VAnchor.Stretch - }; - scrollableWidget.AddChild(sectionContent); - scrollableWidget.ScrollArea.HAnchor = HAnchor.Stretch; - - this.ResizeContainer.AddChild(scrollableWidget); + this.ResizeContainer.AddChild(sectionContent); // A wrapping container to fix resize quirks - GuiWidget with H:Stretch V:Fit that can be hidden and shown and allow the ResizeContainer can keep it's size var resizeWrapper = new GuiWidget() { HAnchor = HAnchor.Stretch, VAnchor = VAnchor.Fit, - Name = "editorRootContainer" + Name = "editorRootContainer", + Visible = expanded }; resizeWrapper.AddChild(this.ResizeContainer); diff --git a/PartPreviewWindow/SelectedObjectPanel.cs b/PartPreviewWindow/SelectedObjectPanel.cs index 6aae0ef82..26fd5d379 100644 --- a/PartPreviewWindow/SelectedObjectPanel.cs +++ b/PartPreviewWindow/SelectedObjectPanel.cs @@ -186,7 +186,16 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } }; - editorSectionWidget = new ResizableSectionWidget("Editor", sceneContext.ViewState.SelectedObjectEditorHeight, editorPanel, theme, serializationKey: UserSettingsKey.EditorPanelExpanded, defaultExpansion: true) + // Wrap editorPanel with scrollable container + var scrollableWidget = new ScrollableWidget(true) + { + HAnchor = HAnchor.Stretch, + VAnchor = VAnchor.Stretch + }; + scrollableWidget.AddChild(editorPanel); + scrollableWidget.ScrollArea.HAnchor = HAnchor.Stretch; + + editorSectionWidget = new ResizableSectionWidget("Editor", sceneContext.ViewState.SelectedObjectEditorHeight, scrollableWidget, theme, serializationKey: UserSettingsKey.EditorPanelExpanded, defaultExpansion: true) { VAnchor = VAnchor.Fit, };