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

Eliminate SetInterval for animation, invoke when auto shown

Browse source
This commit is contained in:
John Lewin 2018-11-20 12:27:22 -08:00
parent 4dbb2fee15
commit db15c85121
1 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
MatterControlLib/PartPreviewWindow/MainViewWidget.cs
View file

@ -150,25 +150,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// Register listeners // Register listeners
UserSettings.Instance.SettingChanged += SetLinkButtonsVisibility; UserSettings.Instance.SettingChanged += SetLinkButtonsVisibility;
RunningInterval showUpdateInterval = null;
updateAvailableButton.VisibleChanged += (s, e) =>
{
if (!updateAvailableButton.Visible)
{
if (showUpdateInterval != null)
{
UiThread.ClearInterval(showUpdateInterval);
showUpdateInterval = null;
}
return;
}
showUpdateInterval = UiThread.SetInterval(() =>
{
ShowUpdateAvailableAnimation();
}, 120);
};
SetLinkButtonsVisibility(this, null); SetLinkButtonsVisibility(this, null);
updateAvailableButton.Click += (s, e) => UiThread.RunOnIdle(() => updateAvailableButton.Click += (s, e) => UiThread.RunOnIdle(() =>
{ {
@ -334,6 +315,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
double displayTime = 1; double displayTime = 1;
double pulseTime = 1; double pulseTime = 1;
double totalSeconds = 0; double totalSeconds = 0;
var textWidgets = updateAvailableButton.Descendants<TextWidget>().Where((w) => w.Visible == true).ToArray(); var textWidgets = updateAvailableButton.Descendants<TextWidget>().Where((w) => w.Visible == true).ToArray();
Color startColor = theme.TextColor; Color startColor = theme.TextColor;
@ -380,9 +362,15 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (UpdateControlData.Instance.UpdateStatus == UpdateControlData.UpdateStatusStates.UpdateAvailable) if (UpdateControlData.Instance.UpdateStatus == UpdateControlData.UpdateStatusStates.UpdateAvailable)
{ {
updateAvailableButton.Visible = true; if (!updateAvailableButton.Visible)
// if we are going to show the update link hide the whats new link no matter what {
seeWhatsNewButton.Visible = false; updateAvailableButton.Visible = true;
this.ShowUpdateAvailableAnimation();
// if we are going to show the update link hide the whats new link no matter what
seeWhatsNewButton.Visible = false;
}
} }
else else
{ {