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

Print recovery test working for dual extruder no probe

Browse source
This commit is contained in:
LarsBrubaker 2020-08-09 08:23:22 -07:00
parent f7457c6758
commit 23e7263da5
10 changed files with 121 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

29
MatterControlLib/Library/Widgets/ListView/LibraryListView.cs
View file

@ -35,6 +35,7 @@ using System.Threading.Tasks;
using MatterHackers.Agg;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.Library;
using MatterHackers.MatterControl.PartPreviewWindow;
using MatterHackers.MatterControl.PrintQueue;
@ -51,8 +52,6 @@ namespace MatterHackers.MatterControl.CustomWidgets
private ThemeConfig theme;
private ILibraryContext LibraryContext;
private int scrollAmount = -1;
private GuiWidget stashedContentView;
private ILibraryContainerLink loadingContainerLink;
@ -133,8 +132,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
}
// If the current view doesn't match the view requested by the container, construct and switch to the requested view
var targetView = Activator.CreateInstance(targetType) as GuiWidget;
if (targetView != null)
if (Activator.CreateInstance(targetType) is GuiWidget targetView)
{
this.ListContentView = targetView;
}
@ -264,10 +262,11 @@ namespace MatterHackers.MatterControl.CustomWidgets
using (contentView.LayoutLock())
{
IEnumerable<ILibraryItem> containerItems = from item in sourceContainer.ChildContainers
where item.IsVisible && this.ContainerFilter(item)
&& this.ContainsActiveFilter(item)
select item;
var containerItems = sourceContainer.ChildContainers
.Where(item => item.IsVisible
&& this.ContainerFilter(item)
&& this.ContainsActiveFilter(item))
.Select(item => item);
// Folder items
foreach (var childContainer in this.SortItems(containerItems))
@ -369,8 +368,6 @@ namespace MatterHackers.MatterControl.CustomWidgets
{
if (value is IListContentView)
{
scrollAmount = -1;
if (contentView != null
&& contentView != value)
{
@ -580,18 +577,6 @@ namespace MatterHackers.MatterControl.CustomWidgets
this.Reload().ConfigureAwait(false);
}
public override void OnMouseWheel(MouseEventArgs mouseEvent)
{
if (scrollAmount == -1)
{
scrollAmount = (int)(this.contentView.Children.FirstOrDefault()?.Height ?? 20);
}
int direction = (mouseEvent.WheelDelta > 0) ? -1 : 1;
ScrollPosition += new Vector2(0, scrollAmount * direction);
}
public override void OnClosed(EventArgs e)
{
if (this.LibraryContext != null)