From 9dfbd1cd77d787abffc63abd3f6e8b7b80f9a66a Mon Sep 17 00:00:00 2001 From: John Lewin Date: Mon, 22 Oct 2018 17:44:08 -0700 Subject: [PATCH] Resize meshContentProvider result if required, fix SetUnsized bug - Issue MatterHackers/MCCentral#4347 Fix thumbnail centering for missing item --- MatterControlLib/ControlElements/MHDropDownList.cs | 9 --------- .../Library/ContentProviders/MeshContentProvider.cs | 3 +-- .../Library/Widgets/ListView/ListViewItemBase.cs | 12 ++++++++++-- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/MatterControlLib/ControlElements/MHDropDownList.cs b/MatterControlLib/ControlElements/MHDropDownList.cs index 5f6107009..946175a4d 100644 --- a/MatterControlLib/ControlElements/MHDropDownList.cs +++ b/MatterControlLib/ControlElements/MHDropDownList.cs @@ -88,11 +88,6 @@ namespace MatterHackers.MatterControl { get { - if (menuVisible) - { - var a = 1; - } - if (base.BackgroundColor != Color.Transparent) { return base.BackgroundColor; @@ -112,10 +107,6 @@ namespace MatterHackers.MatterControl } set { - if (value.GetAsHTMLString() == "#333333") - { - var a = 1; - } base.BackgroundColor = value; } diff --git a/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs b/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs index d58787129..802323059 100644 --- a/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs +++ b/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs @@ -101,7 +101,6 @@ namespace MatterHackers.MatterControl }); } - public async Task GetThumbnail(ILibraryItem libraryItem, int width, int height) { IObject3D object3D = null; @@ -175,6 +174,6 @@ namespace MatterHackers.MatterControl allowMultiThreading: !ApplicationController.Instance.ActivePrinter.Connection.PrinterIsPrinting); } - public ImageBuffer DefaultImage => AggContext.StaticData.LoadIcon("mesh.png"); + public ImageBuffer DefaultImage { get; } = AggContext.StaticData.LoadIcon("mesh.png"); } } \ No newline at end of file diff --git a/MatterControlLib/Library/Widgets/ListView/ListViewItemBase.cs b/MatterControlLib/Library/Widgets/ListView/ListViewItemBase.cs index a7d479fbc..5f5e84231 100644 --- a/MatterControlLib/Library/Widgets/ListView/ListViewItemBase.cs +++ b/MatterControlLib/Library/Widgets/ListView/ListViewItemBase.cs @@ -121,7 +121,15 @@ namespace MatterHackers.MatterControl.CustomWidgets requeueRaytraceOnDraw = false; raytracePending = false; - this.SetSizedThumbnail(thumbnail); + if (thumbnail.Width != thumbWidth + || thumbnail.Height != thumbHeight) + { + this.SetUnsizedThumbnail(thumbnail); + } + else + { + this.SetSizedThumbnail(thumbnail); + } } } }); @@ -184,7 +192,7 @@ namespace MatterHackers.MatterControl.CustomWidgets { this.SetSizedThumbnail( ApplicationController.Instance.Library.EnsureCorrectThumbnailSizing( - theme.GeneratingThumbnailIcon, + thumbnail, thumbWidth, thumbHeight)); }