From fbaf15ad34fcdb92d457171cefb56797be191b3f Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 8 Apr 2022 23:16:36 -0400 Subject: [PATCH] fix: Export shared inst for IWindowManager/Interop Bugs (fixed): * 2 WindowManager instances are created on startup! This causes many problems (for ex, 'IShellWindow.thread_init' is called twice for each shell window) --- .../spark/Modules/Analytics/AnalyticsShellModule.cs | 2 +- src/client/spark/Modules/Trading/TradingShellModule.cs | 3 ++- src/client/spark/core/Settings/ISettingsCollector.cs | 8 ++++---- src/client/spark/view/Shell/WindowManager.cs | 2 -- src/client/spark/view/Shell/Workspaces/WorkspacesModel.cs | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/client/spark/Modules/Analytics/AnalyticsShellModule.cs b/src/client/spark/Modules/Analytics/AnalyticsShellModule.cs index 31ad19282..aaab37e19 100644 --- a/src/client/spark/Modules/Analytics/AnalyticsShellModule.cs +++ b/src/client/spark/Modules/Analytics/AnalyticsShellModule.cs @@ -33,7 +33,7 @@ namespace mbts.spark { [ImportingConstructor] public AnalyticsShellModule( - IBus bus, IWindowManager wm, UserSettingsHub settings_hub, OrdersModel orders_model) { + IBus bus, WindowManager wm, UserSettingsHub settings_hub, OrdersModel orders_model) { _wm = wm; _bus = bus; var reports_demuxer = new TableUpdateDemuxer(default, false); diff --git a/src/client/spark/Modules/Trading/TradingShellModule.cs b/src/client/spark/Modules/Trading/TradingShellModule.cs index f9057ef19..3e492316b 100644 --- a/src/client/spark/Modules/Trading/TradingShellModule.cs +++ b/src/client/spark/Modules/Trading/TradingShellModule.cs @@ -8,6 +8,7 @@ using mbts.persist; using mbts.spark; using mbts.ui; + using mbts.ui.shell; using System; using System.Collections.Generic; @@ -27,7 +28,7 @@ [ImportingConstructor] public TradingShellModule( IBus bus, - IWindowManager wm, + WindowManager wm, INotificationService notification_service, INotificationServiceDataCache notification_service_data_cache, UserSettingsHub settings_hub, diff --git a/src/client/spark/core/Settings/ISettingsCollector.cs b/src/client/spark/core/Settings/ISettingsCollector.cs index e01a0d3cb..bea670d37 100644 --- a/src/client/spark/core/Settings/ISettingsCollector.cs +++ b/src/client/spark/core/Settings/ISettingsCollector.cs @@ -20,20 +20,20 @@ namespace mbts.ui.settings { [Export(typeof(ISettingsCollector))] class SettingsCollector : ISettingsCollector { - IWindowsInterop _interop; - IWindowManager _wm; + WindowManager _wm; ILauncher _launcher; [ImportingConstructor] - public SettingsCollector(IWindowManager wm, IWindowsInterop interop, ILauncher launcher) { + public SettingsCollector(WindowManager wm, ILauncher launcher) { _wm = wm; - _interop = interop; _launcher = launcher; } [Import] public ObservableCollection modules { get; set; } + IWindowsInterop _interop => _wm; + public IEnumerable get_window_state() { foreach (var window in _wm.list_windows()) { // Check that the window is still open since we might be iterating asyncronously diff --git a/src/client/spark/view/Shell/WindowManager.cs b/src/client/spark/view/Shell/WindowManager.cs index bc4308c74..6469327bc 100644 --- a/src/client/spark/view/Shell/WindowManager.cs +++ b/src/client/spark/view/Shell/WindowManager.cs @@ -23,8 +23,6 @@ namespace mbts.ui.shell { // When a new tab is created the WindowManager checks to see if it is requesting an existing FloatingWindow // If so it adds it to that window otherwise it creates a new window. - [Export(typeof(IWindowManager))] - [Export(typeof(IWindowsInterop))] [Export] public class WindowManager : IWindowManager, IWindowsInterop, IDisposable { readonly IShellThreadFactory _threads; diff --git a/src/client/spark/view/Shell/Workspaces/WorkspacesModel.cs b/src/client/spark/view/Shell/Workspaces/WorkspacesModel.cs index da963e6ec..5cee3d04d 100644 --- a/src/client/spark/view/Shell/Workspaces/WorkspacesModel.cs +++ b/src/client/spark/view/Shell/Workspaces/WorkspacesModel.cs @@ -27,7 +27,7 @@ namespace mbts.ui.shell { ISettingsCollector _settings_collector; private ISavedWindowFactory _window_restore; - IWindowManager _wm; + WindowManager _wm; private IPersist _public; private IPersist _private; private ObservableCollection _modules; @@ -69,7 +69,7 @@ namespace mbts.ui.shell { } [Import] - public IWindowManager window_manager { + public WindowManager window_manager { get => _wm; set { _wm = value;