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

Clean up ThemeChanged listeners, remove orphaned ThemeChanged bodies

Browse source
This commit is contained in:
John Lewin 2017-06-21 07:38:02 -07:00
parent d6d625245f
commit 4fd6879c3b
5 changed files with 16 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

18
CustomWidgets/PrintProgressBarWidget.cs
View file

@ -134,7 +134,9 @@ namespace MatterHackers.MatterControl
ApplicationController.Instance.ActivePrintItemChanged.RegisterEvent(Instance_PrintItemChanged, ref unregisterEvents);
PrinterConnection.Instance.CommunicationStateChanged.RegisterEvent(Instance_PrintItemChanged, ref unregisterEvents);
SetThemedColors();
this.printTimeElapsed.TextColor = ActiveTheme.Instance.PrimaryAccentColor;
this.printTimeRemaining.TextColor = ActiveTheme.Instance.PrimaryAccentColor;
this.BackgroundColor = ActiveTheme.Instance.SecondaryAccentColor;
// This is a bit of a hack. Now that we have the printing window we don't want this to show progress but it is still used on touch screen for expanding the display.
if (!UserSettings.Instance.IsTouchScreen)
@ -150,20 +152,6 @@ namespace MatterHackers.MatterControl
base.OnClosed(e);
}
private void SetThemedColors()
{
this.printTimeElapsed.TextColor = ActiveTheme.Instance.PrimaryAccentColor;
this.printTimeRemaining.TextColor = ActiveTheme.Instance.PrimaryAccentColor;
this.BackgroundColor = ActiveTheme.Instance.SecondaryAccentColor;
}
public void ThemeChanged(object sender, EventArgs e)
{
//Set background color to new theme
SetThemedColors();
this.Invalidate();
}
private void Instance_PrintItemChanged(object sender, EventArgs e)
{
UpdatePrintStatus();