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

Only pass workspace into LibraryListView, use workspace context

Browse source 
- Fix broken breadcrumbs
This commit is contained in:
John Lewin 2018-12-12 17:42:47 -08:00
parent 567b3d3076
commit f6cddb646f
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MatterControlLib/Library/Widgets/PrintLibraryWidget.cs
View file

@ -60,6 +60,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
private ThemeConfig theme; private ThemeConfig theme;
private OverflowBar navBar; private OverflowBar navBar;
private GuiWidget searchButton; private GuiWidget searchButton;
private PartWorkspace workspace;
public PrintLibraryWidget(MainViewWidget mainViewWidget, PartWorkspace workspace, ThemeConfig theme, PopupMenuButton popupMenuButton) public PrintLibraryWidget(MainViewWidget mainViewWidget, PartWorkspace workspace, ThemeConfig theme, PopupMenuButton popupMenuButton)
{ {
@ -67,10 +68,11 @@ namespace MatterHackers.MatterControl.PrintLibrary
this.mainViewWidget = mainViewWidget; this.mainViewWidget = mainViewWidget;
this.Padding = 0; this.Padding = 0;
this.AnchorAll(); this.AnchorAll();
this.workspace = workspace;
var allControls = new FlowLayoutWidget(FlowDirection.TopToBottom); var allControls = new FlowLayoutWidget(FlowDirection.TopToBottom);
libraryView = new LibraryListView(workspace.LibraryView, workspace.Printer, theme) libraryView = new LibraryListView(workspace.LibraryView, theme)
{ {
Name = "LibraryView", Name = "LibraryView",
// Drop containers if ShowContainers != 1 // Drop containers if ShowContainers != 1
@ -81,7 +83,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
libraryView.SelectedItems.CollectionChanged += SelectedItems_CollectionChanged; libraryView.SelectedItems.CollectionChanged += SelectedItems_CollectionChanged;
ApplicationController.Instance.Library.ContainerChanged += Library_ContainerChanged; workspace.LibraryView.ContainerChanged += Library_ContainerChanged;
navBar = new OverflowBar(theme) navBar = new OverflowBar(theme)
{ {
@ -430,7 +432,9 @@ namespace MatterHackers.MatterControl.PrintLibrary
if (libraryView?.ActiveContainer != null) if (libraryView?.ActiveContainer != null)
{ {
libraryView.ActiveContainer.ContentChanged -= UpdateStatus; libraryView.ActiveContainer.ContentChanged -= UpdateStatus;
ApplicationController.Instance.Library.ContainerChanged -= Library_ContainerChanged; libraryView.SelectedItems.CollectionChanged -= SelectedItems_CollectionChanged;
workspace.LibraryView.ContainerChanged -= Library_ContainerChanged;
} }
base.OnClosed(e); base.OnClosed(e);