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

Remove SourceColor from theme

Browse source
This commit is contained in:
John Lewin 2018-10-22 08:38:22 -07:00
parent 490a3a4068
commit fcf6f03916
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
MatterControlLib/ConfigurationPage/ApplicationSettings/ThemePreviewButton.cs
View file

@ -35,7 +35,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage
public class ThemePreviewButton : GuiWidget
{
private GuiWidget accentColor;
private Color activeColor;
private GuiWidget secondaryBackground;
private GuiWidget tertiaryBackground;
private GuiWidget icon1;
@ -46,9 +45,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
{
this.ThemeSet = themeSet;
var theme = this.ThemeSet.Theme;
activeColor = theme.Colors.SourceColor;
var theme = themeSet.Theme;
var primaryAccentColor = theme.PrimaryAccentColor;
@ -128,7 +125,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
overlay.Click += (s, e) =>
{
// Activate the theme
themeColorPanel.SetThemeColor(this.ThemeSet, activeColor, this.Mode);
themeColorPanel.SetThemeColor(this.ThemeSet, primaryAccentColor, this.Mode);
};
this.AddChild(overlay);
@ -146,8 +143,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage
icon1.BackgroundColor = adjustedAccentColor;
icon2.BackgroundColor = adjustedAccentColor;
icon3.BackgroundColor = adjustedAccentColor;
activeColor = adjustedAccentColor;
}
}
}