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

Use theme aware 'rebuilding' icon

Browse source 
- Issue MatterHackers/MCCentral#3759
rebuilding icon should be theme aware
This commit is contained in:
John Lewin 2018-06-26 08:40:28 -07:00
parent e13e5504f0
commit a2c65cfbff
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ApplicationView/ThemeConfig.cs
View file

@ -174,6 +174,8 @@ namespace MatterHackers.MatterControl
public Color AccentMimimalOverlay { get; set; }
public BorderDouble SeparatorMargin { get; }
public ImageBuffer GeneratingThumbnailIcon { get; private set; }
public GuiWidget CreateSearchButton()
{
return new IconButton(AggContext.StaticData.LoadIcon("icon_search_24x24.png", 16, 16, this.InvertIcons), this)
@ -206,6 +208,8 @@ namespace MatterHackers.MatterControl
this.Colors = colors;
this.GeneratingThumbnailIcon = AggContext.StaticData.LoadIcon("building_thumbnail_40x40.png", 40, 40, this.InvertIcons);
DefaultThumbView.ThumbColor = new Color(colors.PrimaryTextColor, 30);
var commonOptions = new ButtonFactoryOptions();

5
Library/Widgets/ListView/ListViewItemBase.cs
View file

@ -44,7 +44,6 @@ namespace MatterHackers.MatterControl.CustomWidgets
{
private static ImageBuffer defaultFolderIcon = AggContext.StaticData.LoadIcon(Path.Combine("FileDialog", "folder.png")).SetPreMultiply();
private static ImageBuffer defaultItemIcon = AggContext.StaticData.LoadIcon(Path.Combine("FileDialog", "file.png"));
private static ImageBuffer generatingThumbnailIcon = AggContext.StaticData.LoadIcon(Path.Combine("building_thumbnail_40x40.png"));
protected ThemeConfig theme;
protected ListViewItem listViewItem;
@ -110,7 +109,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
else
{
// Show processing image
this.SetItemThumbnail(generatingThumbnailIcon);
this.SetItemThumbnail(theme.GeneratingThumbnailIcon);
// Ask the provider for a content specific thumbnail
thumbnail = await contentProvider.GetThumbnail(libraryItem, thumbWidth, thumbHeight);
@ -150,7 +149,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
requeueRaytraceOnDraw = false;
// Show processing image
this.SetItemThumbnail(generatingThumbnailIcon);
this.SetItemThumbnail(theme.GeneratingThumbnailIcon);
// Ask the MeshContentProvider to RayTrace the image
var thumbnail = await meshContentProvider.GetThumbnail(listViewItem.Model, thumbWidth, thumbHeight);