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

Add LoadIcon helper function

Browse source
This commit is contained in:
John Lewin 2014-11-25 08:42:18 -08:00
parent eba756966b
commit 28159053ab
9 changed files with 26 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ControlElements/ImageButtonFactory.cs
View file

@ -24,15 +24,10 @@ namespace MatterHackers.MatterControl
disabledImageName = normalImageName;
}
Agg.Image.ImageBuffer normalImage = new Agg.Image.ImageBuffer();
Agg.Image.ImageBuffer pressedImage = new Agg.Image.ImageBuffer();
Agg.Image.ImageBuffer hoverImage = new Agg.Image.ImageBuffer();
Agg.Image.ImageBuffer disabledImage = new Agg.Image.ImageBuffer();
StaticData.Instance.LoadImage(Path.Combine("Icons", normalImageName), normalImage);
StaticData.Instance.LoadImage(Path.Combine("Icons", pressedImageName), pressedImage);
StaticData.Instance.LoadImage(Path.Combine("Icons", hoverImageName), hoverImage);
StaticData.Instance.LoadImage(Path.Combine("Icons", disabledImageName), disabledImage);
Agg.Image.ImageBuffer normalImage = StaticData.Instance.LoadIcon(normalImageName);
Agg.Image.ImageBuffer pressedImage = StaticData.Instance.LoadIconpressedImageName);
Agg.Image.ImageBuffer hoverImage = StaticData.Instance.LoadIcon(hoverImageName);
Agg.Image.ImageBuffer disabledImage = StaticData.Instance.LoadIcon(disabledImageName);
if (!ActiveTheme.Instance.IsDarkTheme && invertImageColor)
{
@ -42,9 +37,6 @@ namespace MatterHackers.MatterControl
InvertLightness.DoInvertLightness(disabledImage);
}
//normalImage.NewGraphics2D().Line(0, 0, normalImage.Width, normalImage.Height, RGBA_Bytes.Violet);
//pressedImage.NewGraphics2D().Line(0, 0, normalImage.Width, normalImage.Height, RGBA_Bytes.Violet);
ButtonViewStates buttonViewWidget = new ButtonViewStates(
new ImageWidget(normalImage),
new ImageWidget(hoverImage),

21
ControlElements/TextImageButtonFactory.cs
View file

@ -183,7 +183,7 @@ namespace MatterHackers.MatterControl
ImageBuffer LoadUpButtonImage(string imageName)
{
ImageBuffer buffer = new ImageBuffer(10, 10, 32, new BlenderBGRA());
StaticData.Instance.LoadImage(Path.Combine("Icons", imageName), buffer);
StaticData.Instance.LoadIcon(imageName, buffer);
if (!ActiveTheme.Instance.IsDarkTheme && AllowThemeToAdjustImage)
{
@ -301,7 +301,7 @@ namespace MatterHackers.MatterControl
if (normalImageName != null)
{
StaticData.Instance.LoadImage(Path.Combine("Icons", normalImageName), normalImage);
StaticData.Instance.LoadIcon(normalImageName, normalImage);
if (!ActiveTheme.Instance.IsDarkTheme && AllowThemeToAdjustImage)
{
InvertLightness.DoInvertLightness(normalImage);
@ -310,7 +310,7 @@ namespace MatterHackers.MatterControl
if (hoverImageName != null)
{
StaticData.Instance.LoadImage(Path.Combine("Icons", pressedImageName), pressedImage);
StaticData.Instance.LoadIcon(pressedImageName, pressedImage);
if (!ActiveTheme.Instance.IsDarkTheme && AllowThemeToAdjustImage)
{
InvertLightness.DoInvertLightness(pressedImage);
@ -319,7 +319,7 @@ namespace MatterHackers.MatterControl
if (pressedImageName != null)
{
StaticData.Instance.LoadImage(Path.Combine("Icons", hoverImageName), hoverImage);
StaticData.Instance.LoadIcon(hoverImageName, hoverImage);
if (!ActiveTheme.Instance.IsDarkTheme && AllowThemeToAdjustImage)
{
InvertLightness.DoInvertLightness(hoverImage);
@ -328,7 +328,7 @@ namespace MatterHackers.MatterControl
if (disabledImageName != null)
{
StaticData.Instance.LoadImage(Path.Combine("Icons", disabledImageName), disabledImage);
StaticData.Instance.LoadIcon(disabledImageName, disabledImage);
if (!ActiveTheme.Instance.IsDarkTheme && AllowThemeToAdjustImage)
{
InvertLightness.DoInvertLightness(disabledImage);
@ -384,7 +384,7 @@ namespace MatterHackers.MatterControl
if (normalImageName != null)
{
StaticData.Instance.LoadImage(Path.Combine("Icons", normalImageName), normalImage);
StaticData.Instance.LoadIcon(normalImageName, normalImage);
if (!ActiveTheme.Instance.IsDarkTheme && AllowThemeToAdjustImage)
{
@ -394,7 +394,7 @@ namespace MatterHackers.MatterControl
if (pressedImageName != null)
{
StaticData.Instance.LoadImage(Path.Combine("Icons", pressedImageName), pressedImage);
StaticData.Instance.LoadIcon(pressedImageName, pressedImage);
if (!ActiveTheme.Instance.IsDarkTheme && AllowThemeToAdjustImage)
{
InvertLightness.DoInvertLightness(pressedImage);
@ -404,7 +404,7 @@ namespace MatterHackers.MatterControl
if (normalToPressedImageName != null)
{
StaticData.Instance.LoadImage(Path.Combine("Icons", normalToPressedImageName), normalToPressedImage);
StaticData.Instance.LoadIcon(normalToPressedImageName, normalToPressedImage);
if (!ActiveTheme.Instance.IsDarkTheme && AllowThemeToAdjustImage)
{
InvertLightness.DoInvertLightness(normalToPressedImage);
@ -413,7 +413,7 @@ namespace MatterHackers.MatterControl
if (pressedToNormalImageName != null)
{
StaticData.Instance.LoadImage(Path.Combine("Icons", pressedToNormalImageName), pressedToNormalImage);
StaticData.Instance.LoadIcon(pressedToNormalImageName, pressedToNormalImage);
if (!ActiveTheme.Instance.IsDarkTheme && AllowThemeToAdjustImage)
{
InvertLightness.DoInvertLightness(pressedToNormalImage);
@ -448,8 +448,7 @@ namespace MatterHackers.MatterControl
if (iconImageName != null)
{
iconImage = new ImageBuffer();
StaticData.Instance.LoadImage(Path.Combine("Icons", iconImageName), iconImage);
iconImage = StaticData.Instance.LoadIcon(iconImageName);
if (!ActiveTheme.Instance.IsDarkTheme && AllowThemeToAdjustImage)
{
InvertLightness.DoInvertLightness(iconImage);