SPARK-1410 Fix shell browser window

This commit is contained in:
Eric Harding committed 2018-08-08 16:25:06 -04:00
1 parent 17f8fa74ea
commit eb8e5ea353
17 files changed
+182 -469

No files matched your search

@@ -17,17 +17,15 @@ using static mbts.ui.shell.ProtoBufSerializationHelper;
namespace bts.shell {
[Export(typeof(IShellModule))]
class HelpShellModule : IShellModule {
IDisposable _dispose;
[ImportingConstructor]
public HelpShellModule(IBus bus, IBrowserWindowManager browser) {
public HelpShellModule(IBus bus) {
_awf = new ActivityWindowFactory(this, bus);
_dispose = Disposable.Create(
bus.subscribe(SparkTags.ShowUri).OnDispatcher().Subscribe(u => browser.Pages.Add(u))
);
_bwf = new BrowserWindowFactory(this, bus);
}
ActivityWindowFactory _awf;
BrowserWindowFactory _bwf;
public ImageSource icon => Icons.Support;
@@ -41,14 +39,17 @@ namespace bts.shell {
//SparkCommands.ShowDiagnostics,
SparkCommands.ShowReportIssue.complete("Created from launcher"),
SparkCommands.ShowAboutSpark,
SparkCommands.ShowActivityLog
// SparkCommands.ShowReleaaseNotes,
SparkCommands.ShowActivityLog,
};
public Task<IShellWindow> create(Stream load_stream) {
return dispatch_to_factory(load_stream, _awf);
return dispatch_to_factory(load_stream, _awf, _bwf);
}
public void Dispose() {
Disposable.dispose(ref _awf);
Disposable.dispose(ref _bwf);
}
}
}