Removing tiny icons
Prepping for improved folder views Fixing warnings
This commit is contained in:
parent
333ef89a9f
commit
0eec29e84d
43 changed files with 466 additions and 463 deletions
|
|
@ -35,31 +35,15 @@ namespace MatterHackers.MatterControl.Library
|
|||
{
|
||||
public class DynamicContainerLink : ILibraryContainerLink, IThumbnail
|
||||
{
|
||||
public string ID { get; set; }
|
||||
private readonly Func<ILibraryContainer> containerCreator;
|
||||
|
||||
public string Category { get; set; }
|
||||
private readonly Func<string> nameResolver;
|
||||
|
||||
public bool IsProtected { get; set; } = true;
|
||||
private readonly ImageBuffer thumbnail;
|
||||
|
||||
public bool IsReadOnly { get; set; } = false;
|
||||
private readonly Func<bool> visibilityResolver;
|
||||
|
||||
public DateTime DateCreated { get; } = DateTime.Now;
|
||||
|
||||
public DateTime DateModified { get; } = DateTime.Now;
|
||||
|
||||
private ImageBuffer thumbnail;
|
||||
private Func<ILibraryContainer> containerCreator;
|
||||
private Func<bool> visibilityResolver;
|
||||
private Func<string> nameResolver;
|
||||
private ImageBuffer microIcon;
|
||||
|
||||
public DynamicContainerLink(Func<string> nameResolver, ImageBuffer microIcon, ImageBuffer thumbnail, Func<ILibraryContainer> creator = null, Func<bool> visibilityResolver = null)
|
||||
: this(nameResolver, thumbnail, creator, visibilityResolver)
|
||||
{
|
||||
this.microIcon = microIcon;
|
||||
}
|
||||
|
||||
private DynamicContainerLink(Func<string> nameResolver, ImageBuffer thumbnail, Func<ILibraryContainer> creator = null, Func<bool> visibilityResolver = null)
|
||||
public DynamicContainerLink(Func<string> nameResolver, ImageBuffer thumbnail, Func<ILibraryContainer> creator = null, Func<bool> visibilityResolver = null)
|
||||
{
|
||||
this.thumbnail = thumbnail?.SetPreMultiply();
|
||||
this.nameResolver = nameResolver;
|
||||
|
|
@ -67,10 +51,22 @@ namespace MatterHackers.MatterControl.Library
|
|||
this.visibilityResolver = visibilityResolver ?? (() => true);
|
||||
}
|
||||
|
||||
public string Name => nameResolver?.Invoke();
|
||||
public string Category { get; set; }
|
||||
|
||||
public DateTime DateCreated { get; } = DateTime.Now;
|
||||
|
||||
public DateTime DateModified { get; } = DateTime.Now;
|
||||
|
||||
public string ID { get; set; }
|
||||
|
||||
public bool IsProtected { get; set; } = true;
|
||||
|
||||
public bool IsReadOnly { get; set; } = false;
|
||||
|
||||
public bool IsVisible => this.visibilityResolver();
|
||||
|
||||
public string Name => nameResolver?.Invoke();
|
||||
|
||||
public Task<ILibraryContainer> GetContainer(Action<double, string> reportProgress)
|
||||
{
|
||||
return Task.FromResult(this.containerCreator());
|
||||
|
|
@ -78,15 +74,7 @@ namespace MatterHackers.MatterControl.Library
|
|||
|
||||
public Task<ImageBuffer> GetThumbnail(int width, int height)
|
||||
{
|
||||
if (microIcon != null
|
||||
&& width < 24
|
||||
&& height < 24)
|
||||
{
|
||||
return Task.FromResult(microIcon?.AlphaToPrimaryAccent());
|
||||
}
|
||||
|
||||
//return Task.FromResult(thumbnail);
|
||||
return Task.FromResult(thumbnail?.AlphaToPrimaryAccent());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue