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

Remove network image

Browse source 
- Issue MatterHackers/MCCentral#2609
Remove network linked image
This commit is contained in:
John Lewin 2018-01-08 15:45:15 -08:00
parent 5b520e880e
commit dea37667ad
2 changed files with 37 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

52
PartPreviewWindow/MainTab.cs
View file

@ -49,7 +49,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public GuiWidget TabContent { get; protected set; }
public SimpleTab(string tabLabel, SimpleTabs parentTabControl, GuiWidget tabContent, ThemeConfig theme, string tabImageUrl = null, bool hasClose = true, double pointSize = 12)
public SimpleTab(string tabLabel, SimpleTabs parentTabControl, GuiWidget tabContent, ThemeConfig theme, string tabImageUrl = null, bool hasClose = true, double pointSize = 12, ImageBuffer iconImage = null)
{
this.HAnchor = HAnchor.Fit;
this.VAnchor = VAnchor.Fit | VAnchor.Bottom;
@ -60,11 +60,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.TabContent = tabContent;
this.parentTabControl = parentTabControl;
this.AddChild(
tabPill = new TabPill(tabLabel, ActiveTheme.Instance.PrimaryTextColor, tabImageUrl, pointSize)
{
Margin = (hasClose) ? new BorderDouble(right: 16) : 0
});
if (iconImage != null)
{
tabPill = new TabPill(tabLabel, ActiveTheme.Instance.PrimaryTextColor, iconImage, pointSize);
}
else
{
tabPill = new TabPill(tabLabel, ActiveTheme.Instance.PrimaryTextColor, tabImageUrl, pointSize);
}
tabPill.Margin = (hasClose) ? new BorderDouble(right: 16) : 0;
this.AddChild(tabPill);
if (hasClose)
{
@ -89,28 +95,37 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
protected class TabPill : FlowLayoutWidget
{
private TextWidget label;
private ImageWidget imageWidget;
public TabPill(string tabTitle, Color textColor, string imageUrl = null, double pointSize = 12)
: this (tabTitle, textColor, string.IsNullOrEmpty(imageUrl) ? null : new ImageBuffer(16, 16), pointSize)
{
if (imageWidget != null
&& !string.IsNullOrEmpty(imageUrl))
{
try
{
// TODO: Use caching
// Attempt to load image
ApplicationController.Instance.DownloadToImageAsync(imageWidget.Image, imageUrl, false);
}
catch { }
}
}
public TabPill(string tabTitle, Color textColor, ImageBuffer imageBuffer = null, double pointSize = 12)
{
this.Selectable = false;
this.Padding = new BorderDouble(10, 5, 10, 4);
if (!string.IsNullOrEmpty(imageUrl))
if (imageBuffer != null)
{
var imageWidget = new ImageWidget(new ImageBuffer(16, 16))
imageWidget = new ImageWidget(imageBuffer)
{
Margin = new BorderDouble(right: 6, bottom: 2),
VAnchor = VAnchor.Center
};
this.AddChild(imageWidget);
// Attempt to load image
try
{
// TODO: Must use caching
ApplicationController.Instance.DownloadToImageAsync(imageWidget.Image, imageUrl, false);
}
catch { }
}
label = new TextWidget(tabTitle, pointSize: pointSize)
@ -173,6 +188,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
}
public ChromeTab(string tabLabel, SimpleTabs parentTabControl, GuiWidget tabContent, ThemeConfig theme, ImageBuffer imageBuffer)
: base(tabLabel, parentTabControl, tabContent, theme, iconImage: imageBuffer)
{
}
private static int tabInsetDistance = 14 / 2;
internal ChromeTab NextTab { get; set; }

2
PartPreviewWindow/PartPreviewContent.cs
View file

@ -198,7 +198,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
tabControl,
new PartTabPage(null, sceneContext, theme, "xxxxx"),
theme,
"https://i.imgur.com/nkeYgfU.png")
AggContext.StaticData.LoadIcon("part.png"))
{
Name = "newPart" + tabControl.AllTabs.Count(),
MinimumSize = new Vector2(120, theme.shortButtonHeight)