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

Move theme.Colors.PrimaryTextColor into theme, remove unneeded types

Browse source 
- Issue MatterHackers/MCCentral#4490
This commit is contained in:
John Lewin 2018-11-03 09:13:07 -07:00
parent c279f8a511
commit 8d4974dc32
103 changed files with 245 additions and 426 deletions
Download patch file Download diff file Expand all files Collapse all files

12
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -180,8 +180,7 @@ namespace MatterHackers.MatterControl
themeset = themeProvider.GetTheme("Modern-Dark");
}
DefaultThumbView.ThumbColor = new Color(themeset.Theme.Colors.PrimaryTextColor, 30);
ActiveTheme.Instance = themeset.Theme.Colors;
DefaultThumbView.ThumbColor = new Color(themeset.Theme.TextColor, 30);
}
public static ThemeConfig LoadTheme(string themeName)
@ -227,9 +226,6 @@ namespace MatterHackers.MatterControl
{
UserSettings.Instance.set(UserSettingsKey.ActiveThemeName, themeset.Name);
//Set new user selected Default
ActiveTheme.Instance = themeset.Theme.Colors;
// Explicitly fire ReloadAll in response to user interaction
ApplicationController.Instance.ReloadAll();
});
@ -814,7 +810,7 @@ namespace MatterHackers.MatterControl
var theme = this.Theme;
if (tab is GuiWidget guiWidget)
{
guiWidget.Descendants<TextWidget>().FirstOrDefault().FlashBackground(theme.PrimaryAccentColor.WithContrast(theme.Colors.PrimaryTextColor, 6).ToColor());
guiWidget.Descendants<TextWidget>().FirstOrDefault().FlashBackground(theme.PrimaryAccentColor.WithContrast(theme.TextColor, 6).ToColor());
}
}
@ -2217,7 +2213,7 @@ If you experience adhesion problems, please re-run leveling."
{
var hideGCodeWarningCheckBox = new CheckBox(doNotAskAgainMessage)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = this.Theme.TextColor,
Margin = new BorderDouble(top: 6, left: 6),
HAnchor = Agg.UI.HAnchor.Left
};
@ -2833,7 +2829,7 @@ If you experience adhesion problems, please re-run leveling."
};
overlay.AddChild(progressPanel);
progressPanel.AddChild(statusText = new TextWidget("", textColor: AppContext.Theme.Colors.PrimaryTextColor)
progressPanel.AddChild(statusText = new TextWidget("", textColor: AppContext.Theme.TextColor)
{
MinimumSize = new Vector2(200, 30),
HAnchor = HAnchor.Center,