AMT-Cheif
/
Stylet
mirror of https://github.com/AMT-Cheif/Stylet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow starting the bootstrapper without an Application 

Relates to #206
This commit is contained in:
Antony Male 2021-02-03 21:22:54 +00:00
parent f1f79e8caf
commit 66d68aed3e
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Stylet/BootstrapperBase.cs
View File

@ -34,6 +34,13 @@ namespace Stylet
/// <summary>
/// Called by the ApplicationLoader when this bootstrapper is loaded
/// </summary>
/// <remarks>
/// If you're constructing the bootstrapper yourself, call this manully and pass in the Application
/// (probably <see cref="Application.Current"/>). Stylet will start when <see cref="Application.Startup"/>
/// is fired. If no Application is available, do not call this but instead call <see cref="Start(string[])"/>.
/// (In this case, note that the <see cref="Execute"/> methods will all dispatch synchronously, unless you
/// set <see cref="Execute.Dispatcher"/> yourself).
/// </remarks>
/// <param name="application">Application within which Stylet is running</param>
public void Setup(Application application)
{
@ -64,6 +71,10 @@ namespace Stylet
/// <summary>
/// Called on Application.Startup, this does everything necessary to start the application
/// </summary>
/// <remarks>
/// If you're constructing the bootstrapper yourself, and aren't able to call <see cref="Setup(Application)"/>,
/// (e.g. because an Application isn't available), you must call this yourself.
/// </remarks>
/// <param name="args">Command-line arguments used to start this executable</param>
public virtual void Start(string[] args)
{
@ -73,9 +84,8 @@ namespace Stylet
this.ConfigureBootstrapper();
// Cater for the unit tests, which can't sensibly stub Application
if (this.Application != null)
this.Application.Resources.Add(View.ViewManagerResourceKey, this.GetInstance(typeof(IViewManager)));
// We allow starting without an application
this.Application?.Resources.Add(View.ViewManagerResourceKey, this.GetInstance(typeof(IViewManager)));
this.Configure();
this.Launch();
@ -107,7 +117,7 @@ namespace Stylet
/// <returns>The currently-displayed window, or null</returns>
public virtual Window GetActiveWindow()
{
return this.Application.Windows.OfType<Window>().FirstOrDefault(x => x.IsActive) ?? this.Application.MainWindow;
return this.Application?.Windows.OfType<Window>().FirstOrDefault(x => x.IsActive) ?? this.Application?.MainWindow;
}
/// <summary>