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

Remove scrollable from ResizableSectionWidget, wrap in caller

Browse source
This commit is contained in:
John Lewin 2018-06-23 07:05:26 -07:00
parent ed7dc9ce99
commit 77ba63fd82
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
PartPreviewWindow/ResizableSectionWidget.cs
View file

@ -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);

11
PartPreviewWindow/SelectedObjectPanel.cs
View file

@ -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,
};