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

Merge pull request #1563 from jlewin/1.6.0

Browse source 
Revise SystemWindow Close/Open calls to fix out of order SysWindow stack
This commit is contained in:
Lars Brubaker 2016-11-01 17:37:47 -07:00 • committed by GitHub
commit 5ae882a671
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
PrinterControls/PrinterConnections/ShowAuthPanel.cs
View file

@ -78,21 +78,28 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
UiThread.RunOnIdle(WizardWindow.Close);
}
};
var createAccountButton = textImageButtonFactory.Generate("Create Account".Localize());
createAccountButton.Name = "Create Account From Connection Wizard Button";
createAccountButton.Margin = new Agg.BorderDouble(right: 5);
createAccountButton.Click += (s, e) =>
{
WizardWindow.ChangeToAccountCreate();
UiThread.RunOnIdle(WizardWindow.Close);
UiThread.RunOnIdle (() =>
{
WizardWindow.Close();
WizardWindow.ChangeToAccountCreate();
});
};
var signInButton = textImageButtonFactory.Generate("Sign In".Localize());
signInButton.Name = "Sign In From Connection Wizard Button";
signInButton.Click += (s, e) =>
{
WizardWindow.ShowAuthDialog?.Invoke();
UiThread.RunOnIdle(WizardWindow.Close);
UiThread.RunOnIdle (() =>
{
WizardWindow.Close();
WizardWindow.ShowAuthDialog?.Invoke();
});
};
footerRow.AddChild(skipButton);