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

Remove Theme Suspend/Resume calls, only fire ReloadAll if not loading

Browse source
This commit is contained in:
John Lewin 2017-06-21 07:29:22 -07:00
parent e9d7cefa85
commit d6d625245f
3 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ApplicationView/ApplicationController.cs
View file

@ -303,7 +303,13 @@ namespace MatterHackers.MatterControl
this.Library.ContentProviders.Add(new[] { "stl", "amf", "mcx" }, new MeshContentProvider());
// Name = "MainSlidePanel";
ActiveTheme.ThemeChanged.RegisterEvent((s, e) => ReloadAll(), ref unregisterEvents);
ActiveTheme.ThemeChanged.RegisterEvent((s, e) =>
{
if (!MatterControlApplication.IsLoading)
{
ReloadAll();
}
}, ref unregisterEvents);
ActiveSliceSettings.MaterialPresetChanged += (s, e) =>
{
@ -537,8 +543,6 @@ namespace MatterHackers.MatterControl
static void LoadOemOrDefaultTheme()
{
ActiveTheme.SuspendEvents();
// if not check for the oem color and use it if set
// else default to "Blue - Light"
string oemColor = OemSettings.Instance.ThemeColor;
@ -550,8 +554,6 @@ namespace MatterHackers.MatterControl
{
ActiveTheme.Instance = ActiveTheme.GetThemeColors(oemColor);
}
ActiveTheme.ResumeEvents();
}
public static ApplicationController Instance