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

Modify ButtonFactory to correctly adjust DisabledImage if not specified

Browse source
This commit is contained in:
John Lewin 2017-03-09 06:27:15 -08:00
parent 8a7376b871
commit 28eb683e48
2 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ControlElements/TextImageButtonFactory.cs
View file

@ -340,21 +340,6 @@ namespace MatterHackers.MatterControl
private ButtonViewStates getButtonView(string label, string normalImageName = null, string hoverImageName = null, string pressedImageName = null, string disabledImageName = null, bool centerText = false)
{
if (hoverImageName == null)
{
hoverImageName = normalImageName;
}
if (pressedImageName == null)
{
pressedImageName = hoverImageName;
}
if (disabledImageName == null)
{
disabledImageName = normalImageName;
}
ImageBuffer normalImage = null;
ImageBuffer pressedImage = null;
ImageBuffer hoverImage = null;
@ -401,7 +386,8 @@ namespace MatterHackers.MatterControl
if (disabledImage == null && normalImage != null)
{
disabledImage = new ImageBuffer(normalImage);
// Generate the disabled image by lowering the alpha
disabledImage = normalImage.Multiply(new RGBA_Bytes(255, 255, 255, 150));
}
if (ActiveTheme.Instance.IsDarkTheme