From a53eb74696aceca256dd87539b3bbc41d5b8ee72 Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Fri, 11 Sep 2020 07:09:10 -0700 Subject: [PATCH] Made GitHub containers show an icon if not on server --- MatterControlLib/Library/Providers/GitHub/GitHubContainer.cs | 2 +- MatterControlLib/Library/Providers/LibraryConfig.cs | 4 ++-- Submodules/agg-sharp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MatterControlLib/Library/Providers/GitHub/GitHubContainer.cs b/MatterControlLib/Library/Providers/GitHub/GitHubContainer.cs index c591bb05f..e2f325d53 100644 --- a/MatterControlLib/Library/Providers/GitHub/GitHubContainer.cs +++ b/MatterControlLib/Library/Providers/GitHub/GitHubContainer.cs @@ -145,7 +145,7 @@ namespace MatterHackers.MatterControl.Library if (imageUrl.name.Contains(item.ID)) { // download the image and cache it - var image = new ImageBuffer(1, 1); + var image = new ImageBuffer(LibraryConfig.DefaultItemIcon); image.SetRecieveBlender(new BlenderPreMultBGRA()); WebCache.RetrieveImageAsync(image, imageUrl.url, false); return Task.FromResult(image); diff --git a/MatterControlLib/Library/Providers/LibraryConfig.cs b/MatterControlLib/Library/Providers/LibraryConfig.cs index 7d1ac3cb8..5812703a3 100644 --- a/MatterControlLib/Library/Providers/LibraryConfig.cs +++ b/MatterControlLib/Library/Providers/LibraryConfig.cs @@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl.Library private static ImageBuffer defaultFolderIcon = AggContext.StaticData.LoadIcon(Path.Combine("Library", "folder.png")).SetPreMultiply(); - private static ImageBuffer defaultItemIcon = AggContext.StaticData.LoadIcon(Path.Combine("Library", "file.png")); + public static ImageBuffer DefaultItemIcon { get; } = AggContext.StaticData.LoadIcon(Path.Combine("Library", "file.png")); private ILibraryContainer activeContainer; @@ -278,7 +278,7 @@ namespace MatterHackers.MatterControl.Library if (thumbnail == null) { // Use the listview defaults - thumbnail = ((libraryItem is ILibraryContainerLink) ? defaultFolderIcon : defaultItemIcon).AlphaToPrimaryAccent(); + thumbnail = ((libraryItem is ILibraryContainerLink) ? defaultFolderIcon : DefaultItemIcon).AlphaToPrimaryAccent(); } // TODO: Resolve and implement diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index ceb06d606..83b864563 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit ceb06d606f8bcaa3100965dbf31aef5c7093f2be +Subproject commit 83b864563d64d145a7d041c0b7599b0b4b66af87