diff --git a/src/client/spark/Daemons/SecurityPickerDaemon.cs b/src/client/spark/Daemons/SecurityPickerDaemon.cs index 5b066f206..81aad4a78 100644 --- a/src/client/spark/Daemons/SecurityPickerDaemon.cs +++ b/src/client/spark/Daemons/SecurityPickerDaemon.cs @@ -53,8 +53,8 @@ namespace bts { } // void handle_bad_icon(string icon_error_desc) { - Log.Api.warn($"{nameof(SecurityPickerDaemon)} received a message '{message.title}' with {icon_error_desc}, will use {nameof(Icons.AdminFrozen)}."); - icon = Icons.AdminFrozen; + Log.Api.warn($"{nameof(SecurityPickerDaemon)} received a message '{message.title}' with {icon_error_desc}, will use {nameof(Icons.Admin)}."); + icon = Icons.Admin; } // var cpv = new ContractPickerView(vm); diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs index 944f73258..adc9118a4 100644 --- a/src/client/spark/Images/Icons.cs +++ b/src/client/spark/Images/Icons.cs @@ -16,11 +16,6 @@ namespace mbts.ui { ToolsGeometryKey = nameof(ToolsGeometryKey), DraggableGeometryKey = nameof(DraggableGeometryKey); - static Icons() { - // TODO: probably do this for all icons, only reason for holding back is the uncertainity of any unexpected impacts - AdminFrozen = Admin.frozen(); - } - public static Geometry PlayGeometry => Geometry.Parse(_get_geometric_path(PlayGeometryKey).FirstOrDefault() ?? string.Empty); static readonly string base_uri = "pack://application:,,,/Images/Icons/"; @@ -32,40 +27,43 @@ namespace mbts.ui { [Obsolete("Please only add new vector icons using icons.xaml")] private static ImageSource load_image(string filename) { - return new BitmapImage(uri(filename)); + return new BitmapImage(uri(filename)).frozen(); + } + + private static ImageSource load_resource_and_freeze(string resource_name) { + return ((DrawingImage)_resources[resource_name]).frozen(); } #pragma warning disable CS0618 // Type or member is obsolete public static ImageSource Logo { get { return load_image("logo.ico"); } } - public static ImageSource Admin { get { return (DrawingImage)_resources["Admin"]; } } - public static ImageSource AdminFrozen { get; } - public static ImageSource Analytics { get { return (DrawingImage)_resources["Analytics"]; } } - public static ImageSource Sheets { get { return (DrawingImage)_resources["Sheets"]; } } - public static ImageSource Trades { get { return (DrawingImage)_resources["Trades"]; } } - public static ImageSource Depth { get { return (DrawingImage)_resources["Depth"]; } } - public static ImageSource Ladder { get { return (DrawingImage)_resources["Ladder"]; } } + public static ImageSource Admin { get { return load_resource_and_freeze("Admin"); } } + public static ImageSource Analytics { get { return load_resource_and_freeze("Analytics"); } } + public static ImageSource Sheets { get { return load_resource_and_freeze("Sheets"); } } + public static ImageSource Trades { get { return load_resource_and_freeze("Trades"); } } + public static ImageSource Depth { get { return load_resource_and_freeze("Depth"); } } + public static ImageSource Ladder { get { return load_resource_and_freeze("Ladder"); } } public static ImageSource SheetsRed { get { return load_image("SheetsRed.png"); } } public static ImageSource SheetsGreen { get { return load_image("SheetsGreen.png"); } } - public static ImageSource Spreads { get { return (DrawingImage)_resources["Spreads"]; } } + public static ImageSource Spreads { get { return load_resource_and_freeze("Spreads"); } } public static ImageSource BlueSpreads { get { return load_image("BlueSpread.ico"); } } - public static ImageSource Reports { get { return (DrawingImage)_resources["Reports"]; } } - public static ImageSource Risk { get { return (DrawingImage)_resources["Risk"]; } } - public static ImageSource Eye { get { return (DrawingImage)_resources["Eye"]; } } - public static ImageSource Coins { get { return (DrawingImage)_resources["Coins"]; } } + public static ImageSource Reports { get { return load_resource_and_freeze("Reports"); } } + public static ImageSource Risk { get { return load_resource_and_freeze("Risk"); } } + public static ImageSource Eye { get { return load_resource_and_freeze("Eye"); } } + public static ImageSource Coins { get { return load_resource_and_freeze("Coins"); } } public static ImageSource DataCopy { get { return load_image("DataCopy.ico"); } } public static ImageSource Refresh { get { return load_image("Refresh.png"); } } public static ImageSource FavoriteWindow { get { return load_image("FavoriteWindow.png"); } } - public static ImageSource Browser => (DrawingImage)_resources["Browser"]; + public static ImageSource Browser => load_resource_and_freeze("Browser"); public static ImageSource Date { get { return load_image("Date.png"); } } - public static ImageSource Cube3d { get { return (DrawingImage)_resources["Cube"]; } } + public static ImageSource Cube3d { get { return load_resource_and_freeze("Cube"); } } public static ImageSource Algo { get { return Cube3d; } } public static ImageSource Quote { get { return Math; } } - public static ImageSource Math { get { return (DrawingImage)_resources["Surface"]; } } + public static ImageSource Math { get { return load_resource_and_freeze("Surface"); } } public static ImageSource Abacus { get { return load_image("Abacus.png"); } } public static ImageSource Delete { get { return load_image("Delete.png"); } } @@ -77,58 +75,58 @@ namespace mbts.ui { #pragma warning restore CS0618 // Vector icons - public static ImageSource Bookmarks { get { return (DrawingImage)_resources["Bookmarks"]; } } - public static ImageSource Window { get { return (DrawingImage)_resources["Window"]; } } - public static ImageSource ActiveWindow { get { return (DrawingImage)_resources["ActiveWindow"]; } } - public static ImageSource Trash { get { return (DrawingImage)_resources["Trash"]; } } - public static ImageSource Trash2 { get { return (DrawingImage)_resources["Trash2"]; } } - public static ImageSource Crucible { get { return (DrawingImage)_resources["Crucible"]; } } + public static ImageSource Bookmarks { get { return load_resource_and_freeze("Bookmarks"); } } + public static ImageSource Window { get { return load_resource_and_freeze("Window"); } } + public static ImageSource ActiveWindow { get { return load_resource_and_freeze("ActiveWindow"); } } + public static ImageSource Trash { get { return load_resource_and_freeze("Trash"); } } + public static ImageSource Trash2 { get { return load_resource_and_freeze("Trash2"); } } + public static ImageSource Crucible { get { return load_resource_and_freeze("Crucible"); } } - public static ImageSource Accounting { get { return (DrawingImage)_resources["Accounting"]; } } - public static ImageSource Add { get { return (DrawingImage)_resources["Add"]; } } - public static ImageSource AddEncircled { get { return (DrawingImage)_resources["AddEncircled"]; } } - public static ImageSource Beaker { get { return (DrawingImage)_resources["Beaker"]; } } - public static ImageSource Book { get { return (DrawingImage)_resources["Book"]; } } + public static ImageSource Accounting { get { return load_resource_and_freeze("Accounting"); } } + public static ImageSource Add { get { return load_resource_and_freeze("Add"); } } + public static ImageSource AddEncircled { get { return load_resource_and_freeze("AddEncircled"); } } + public static ImageSource Beaker { get { return load_resource_and_freeze("Beaker"); } } + public static ImageSource Book { get { return load_resource_and_freeze("Book"); } } public static ImageSource Orders => create_icon(OrdersGeometryKey); - public static ImageSource AddOrders { get { return (DrawingImage)_resources["AddOrders"]; } } - public static ImageSource CancelOrders { get { return (DrawingImage)_resources["CancelOrders"]; } } - public static ImageSource CancelBuys { get { return (DrawingImage)_resources["CancelBuys"]; } } - public static ImageSource CancelSells { get { return (DrawingImage)_resources["CancelSells"]; } } - public static ImageSource CancelSelected { get { return (DrawingImage)_resources["CancelSelected"]; } } + public static ImageSource AddOrders { get { return load_resource_and_freeze("AddOrders"); } } + public static ImageSource CancelOrders { get { return load_resource_and_freeze("CancelOrders"); } } + public static ImageSource CancelBuys { get { return load_resource_and_freeze("CancelBuys"); } } + public static ImageSource CancelSells { get { return load_resource_and_freeze("CancelSells"); } } + public static ImageSource CancelSelected { get { return load_resource_and_freeze("CancelSelected"); } } - public static ImageSource LadderCancelOrders { get { return (DrawingImage)_resources["LadderCancelOrders"]; } } - public static ImageSource LadderCancelBuys { get { return (DrawingImage)_resources["LadderCancelBuys"]; } } - public static ImageSource LadderCancelSells { get { return (DrawingImage)_resources["LadderCancelSells"]; } } + public static ImageSource LadderCancelOrders { get { return load_resource_and_freeze("LadderCancelOrders"); } } + public static ImageSource LadderCancelBuys { get { return load_resource_and_freeze("LadderCancelBuys"); } } + public static ImageSource LadderCancelSells { get { return load_resource_and_freeze("LadderCancelSells"); } } - public static ImageSource Synthetics { get { return (DrawingImage)_resources["Synthetics"]; } } - public static ImageSource AddSynthetic { get { return (DrawingImage)_resources["AddSynthetic"]; } } - public static ImageSource RemoveSynthetic { get { return (DrawingImage)_resources["RemoveSynthetic"]; } } - public static ImageSource ModifySynthetic { get { return (DrawingImage)_resources["ModifySynthetic"]; } } - public static ImageSource CloneSynthetic { get { return (DrawingImage)_resources["CloneSynthetic"]; } } + public static ImageSource Synthetics { get { return load_resource_and_freeze("Synthetics"); } } + public static ImageSource AddSynthetic { get { return load_resource_and_freeze("AddSynthetic"); } } + public static ImageSource RemoveSynthetic { get { return load_resource_and_freeze("RemoveSynthetic"); } } + public static ImageSource ModifySynthetic { get { return load_resource_and_freeze("ModifySynthetic"); } } + public static ImageSource CloneSynthetic { get { return load_resource_and_freeze("CloneSynthetic"); } } - public static ImageSource ModifyOrder { get { return (DrawingImage)_resources["ModifyOrder"]; } } - public static ImageSource Clock { get { return (DrawingImage)_resources["Clock"]; } } - public static ImageSource Defrag { get { return (DrawingImage)_resources["Defrag"]; } } - public static ImageSource Display { get { return (DrawingImage)_resources["Display"]; } } + public static ImageSource ModifyOrder { get { return load_resource_and_freeze("ModifyOrder"); } } + public static ImageSource Clock { get { return load_resource_and_freeze("Clock"); } } + public static ImageSource Defrag { get { return load_resource_and_freeze("Defrag"); } } + public static ImageSource Display { get { return load_resource_and_freeze("Display"); } } public static ImageSource Draggable => create_icon(DraggableGeometryKey); - public static ImageSource Export => (DrawingImage)_resources["Export"]; - public static ImageSource Filter { get { return (DrawingImage)_resources["Filter"]; } } - public static ImageSource FilterActive { get { return (DrawingImage)_resources["FilterActive"]; } } - public static ImageSource FilterError { get { return (DrawingImage)_resources["FilterError"]; } } + public static ImageSource Export => load_resource_and_freeze("Export"); + public static ImageSource Filter { get { return load_resource_and_freeze("Filter"); } } + public static ImageSource FilterActive { get { return load_resource_and_freeze("FilterActive"); } } + public static ImageSource FilterError { get { return load_resource_and_freeze("FilterError"); } } public static ImageSource Gear => create_icon(GearGeometryKey); - public static ImageSource Import => (DrawingImage)_resources["Import"]; - public static ImageSource Knight { get { return (DrawingImage)_resources["Knight"]; } } + public static ImageSource Import => load_resource_and_freeze("Import"); + public static ImageSource Knight { get { return load_resource_and_freeze("Knight"); } } public static ImageSource Payment => create_icon(PaymentGeometryKey); - public static ImageSource Spawn { get { return (DrawingImage)_resources["Spawn"]; } } - public static ImageSource Target { get { return (DrawingImage)_resources["Target"]; } } - public static ImageSource Tetris { get { return (DrawingImage)_resources["Tetris"]; } } + public static ImageSource Spawn { get { return load_resource_and_freeze("Spawn"); } } + public static ImageSource Target { get { return load_resource_and_freeze("Target"); } } + public static ImageSource Tetris { get { return load_resource_and_freeze("Tetris"); } } public static ImageSource Tools => create_icon(ToolsGeometryKey); - public static ImageSource ViewSettings => (DrawingImage)_resources["ViewSettings"]; - public static ImageSource Wrench { get { return (DrawingImage)_resources["Wrench"]; } } - public static ImageSource RightArrow { get { return ((DrawingImage)_resources["RightArrow"]); } } - public static ImageSource DownArrow { get { return ((DrawingImage)_resources["DownArrow"]); } } - public static ImageSource Support => (DrawingImage)_resources["SupportIcon"]; + public static ImageSource ViewSettings => load_resource_and_freeze("ViewSettings"); + public static ImageSource Wrench { get { return load_resource_and_freeze("Wrench"); } } + public static ImageSource RightArrow { get { return (load_resource_and_freeze("RightArrow")); } } + public static ImageSource DownArrow { get { return (load_resource_and_freeze("DownArrow")); } } + public static ImageSource Support => load_resource_and_freeze("SupportIcon"); public static ImageSource create_icon(string geometric_path_key) => create_icon(geometric_path_key, Brushes.Black); diff --git a/src/client/spark/Modules/Settings/SettingsShellModule.cs b/src/client/spark/Modules/Settings/SettingsShellModule.cs index a5dafb9e4..005dd648b 100644 --- a/src/client/spark/Modules/Settings/SettingsShellModule.cs +++ b/src/client/spark/Modules/Settings/SettingsShellModule.cs @@ -42,7 +42,7 @@ namespace bts.ui { _bus = bus; } - public ImageSource icon => Icons.AdminFrozen; + public ImageSource icon => Icons.Admin; public string name => "Settings"; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 8b0652f65..02bd76fbf 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -30,7 +30,6 @@ namespace mbts.spark { string _symbol; OrderBookRowVM _parent; OrderBookVM.BranchFilterSource _branch_filter_source; - IDisposable _branch_filter_sub; // Core IOrderBookCellStore _order_key_store; IOrderBookCellStore _parent_order_key_store; @@ -114,15 +113,11 @@ namespace mbts.spark { _show_order_modify_cmd = new ObservantCommand(() => bus.post(SparkTags.ShowModifyOrderTag, _order.Key)); _show_order_modify_cmd.OnNext(status.value == OrderStatus.Working); row_passes_filter = _book_vm.columns.filter(this); - _passes_filter = backing(nameof(passes_filter), - Observable.FromEvent>, IObservable>( - cb => _branch_filter_source_changed += cb, cb => _branch_filter_source_changed -= cb) - .SelectMany(o => o)); + _passes_filter = backing(nameof(passes_filter), row_passes_filter); } public event Action invalidated; public event Action<(OrderRecordTuple old_val, OrderRecordTuple new_val)> updated; - event Action> _branch_filter_source_changed; public OrderRecordImmutable order => _order; public OrderMetadata order_metadata => _model.factory.get_metadata(order_type.value); @@ -228,11 +223,15 @@ namespace mbts.spark { } public void join_branch_filter_source(OrderBookVM.BranchFilterSource new_branch_filter_source) { + if (_branch_filter_source != null) { + _branch_filter_source.passes_filter_changed -= _passes_filter.set; + } _branch_filter_source = new_branch_filter_source; _branch_filter_source.set_row_passes_filter(_order.Key, row_passes_filter); - _branch_filter_source_changed?.Invoke(_branch_filter_source); foreach (var child_row in _child_rows) child_row.join_branch_filter_source(_branch_filter_source); + _passes_filter.set(_branch_filter_source.passes_filter); + _branch_filter_source.passes_filter_changed += _passes_filter.set; } /// @@ -311,7 +310,13 @@ namespace mbts.spark { public override int GetHashCode() => (int)_order.Key; public override string ToString() => $"{order_key} {last_change} {parent_order_key}"; - protected override void Dispose(bool disposing) => Disposable.dispose(ref _branch_filter_sub); + protected override void Dispose(bool disposing) { + // idempotent + if (_branch_filter_source != null) { + _branch_filter_source.passes_filter_changed -= _passes_filter.set; + _branch_filter_source = null; + } + } static IEnumerable _descendents(OrderBookRowVM root) { foreach (var child in root.child_orders) { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 93996d4fe..24815f6ca 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -27,10 +27,7 @@ namespace mbts.spark { partial class OrderBookVM : DisposableViewModelBase, IHandleRowSelection { readonly LiveSortingColumKeys _live_sorting_columns; readonly Property _current_row; - readonly Subject<(IEnumerable added, IEnumerable removed)> _order_securities_subject = - new Subject<(IEnumerable added, IEnumerable removed)>(); OrderBookStartupData _state; - Dictionary _order_rows_cache = new Dictionary(); Dictionary _branch_filter_roots = new Dictionary(); ObservableCollection _order_rows = new ObservableCollection(); @@ -39,7 +36,8 @@ namespace mbts.spark { SetMap _security_orders = new SetMap(); public OrderBookVM(IObservable owner_title, IBus bus, INotificationService notification_service, OrdersModel model) { - columns = new OrderBookColumnCollection(bus, model, _order_securities_subject); + var order_securities_subject = new Subject<(IEnumerable added, IEnumerable removed)>(); + columns = new OrderBookColumnCollection(bus, model, order_securities_subject); rows_view = CollectionViewSource.GetDefaultView(_order_rows); rows_view.Filter = obj => obj is OrderBookRowVM vm && vm.is_visible && vm.passes_filter; columns.filter_changed += () => { @@ -73,7 +71,8 @@ namespace mbts.spark { bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(on_securities), model.on_orders.OnDispatcher().AddRemoveOnly().Subscribe(on_orders), grid_settings_manager, - columns); + columns, + order_securities_subject); void on_orders(LegacyTableUpdate table) { // clear everything (most likely the server restarted) @@ -170,7 +169,7 @@ namespace mbts.spark { _order_rows.Add(row); } if (added_securities.Count > 0 || removed_securities.Count > 0) - _order_securities_subject.OnNext((added_securities, removed_securities)); + order_securities_subject.OnNext((added_securities, removed_securities)); void try_add_children(OrderBookRowVM row) { if (_parent_to_children.try_lookup(row.order.Key, out ISet children)) @@ -206,7 +205,7 @@ namespace mbts.spark { } } if (added_securities.Count > 0) - _order_securities_subject.OnNext((added_securities, new List(0))); + order_securities_subject.OnNext((added_securities, new List(0))); } } @@ -243,6 +242,9 @@ namespace mbts.spark { internal void remove_branch_filter_root(uint key) => _branch_filter_roots.Remove(key); + protected override void Dispose(bool disposing) => + Disposable.dispose(_order_rows); + static GridSettingsManager _create_grid_settings_manager( IObservable owner_title, IBus bus, INotificationService notification_service, OrdersModel model, ObservableCollection rows, ICollectionView rows_view, ObservableCollection columns) { @@ -297,24 +299,21 @@ namespace mbts.spark { } } - internal class BranchFilterSource : IObservable { + internal class BranchFilterSource { readonly HashSet _orders_pass_filter = new HashSet(); - event Action _passes_filter_changed; + + public event Action passes_filter_changed; + + public bool passes_filter => _orders_pass_filter.Count > 0; public void set_row_passes_filter(uint key, bool value) { if (value) { if (_orders_pass_filter.Add(key) && _orders_pass_filter.Count == 1) - _passes_filter_changed?.Invoke(value); + passes_filter_changed?.Invoke(value); } else if (_orders_pass_filter.Remove(key) && _orders_pass_filter.Count == 0) { - _passes_filter_changed?.Invoke(value); + passes_filter_changed?.Invoke(value); } } - - public IDisposable Subscribe(IObserver observer) { - _passes_filter_changed += observer.OnNext; - observer.OnNext(_orders_pass_filter.Count > 0); - return Disposable.Create(() => _passes_filter_changed -= observer.OnNext); - } } class LiveSortingColumKeys : HashSet { diff --git a/src/client/spark/core/Bus/SparkCommands.cs b/src/client/spark/core/Bus/SparkCommands.cs index 4d632b182..f134ace8a 100644 --- a/src/client/spark/core/Bus/SparkCommands.cs +++ b/src/client/spark/core/Bus/SparkCommands.cs @@ -70,7 +70,7 @@ namespace bts.spark public static SparkCommand ShowWorkspaces => SparkCommand.create("Workspaces", Icons.FavoriteWindow, SparkTags.ShowWorkspaces); public static SparkCommand ShowSettings => - SparkCommand.create("Settings", Icons.AdminFrozen, SparkTags.ShowSettings); + SparkCommand.create("Settings", Icons.Admin, SparkTags.ShowSettings); // Support public static SparkCommand ShowManual => @@ -113,12 +113,12 @@ namespace bts.spark // TODO: remove this method, eventually want all windows to use window_settings_command() public static SparkCommand change_securities_command(Func<(PartialCommand, SecurityCriteria)> get_param) => - SparkCommand.create("Settings", Icons.AdminFrozen, SparkTags.ShowAndEditPickMultiple, get_param); + SparkCommand.create("Settings", Icons.Admin, SparkTags.ShowAndEditPickMultiple, get_param); public static PartialCommand change_securities_callback(string window_name) => - SparkCommand.create(window_name, Icons.AdminFrozen, new SparkTags.SparkTag($"Change {window_name} securities callback")); + SparkCommand.create(window_name, Icons.Admin, new SparkTags.SparkTag($"Change {window_name} securities callback")); public static SparkCommand window_settings_command(IDialogCommand launch_settings_editor) => - new SparkCommandWrapper("Settings", Icons.AdminFrozen, launch_settings_editor); + new SparkCommandWrapper("Settings", Icons.Admin, launch_settings_editor); } } \ No newline at end of file diff --git a/src/client/spark/view/Shell/FloatingWindow.xaml.cs b/src/client/spark/view/Shell/FloatingWindow.xaml.cs index 222834fb8..73c413706 100644 --- a/src/client/spark/view/Shell/FloatingWindow.xaml.cs +++ b/src/client/spark/view/Shell/FloatingWindow.xaml.cs @@ -154,6 +154,7 @@ namespace mbts.ui.shell foreach (TabDocument document in _tabs.Items.OfType().ToList()) { if (document != null && document.ViewModel.CloseCommand.CanExecute(this)) { document.ViewModel.CloseCommand.Execute(this); + document.ViewModel.Closing -= TabClosing; } } } diff --git a/src/client/spark/view/Shell/ViewModels/ShellThreadFactory.cs b/src/client/spark/view/Shell/ViewModels/ShellThreadFactory.cs index 8375d24da..ca9b19ec4 100644 --- a/src/client/spark/view/Shell/ViewModels/ShellThreadFactory.cs +++ b/src/client/spark/view/Shell/ViewModels/ShellThreadFactory.cs @@ -10,6 +10,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Threading; +using System.Windows.Interop; namespace mbts.ui.shell { @@ -19,9 +20,8 @@ namespace mbts.ui.shell class UIThreadData : IDisposable { public Dispatcher dispatcher; public Thread thread; - public List windows = new List(); - public System.Windows.Interop.MSG last_msg; - public void Dispose() { lock(windows) Disposable.dispose(windows); } + public MSG last_msg; + public void Dispose() {} } int _count = 0; ConcurrentDictionary _shared_threads = new ConcurrentDictionary(); @@ -38,7 +38,7 @@ namespace mbts.ui.shell uid.thread = new Thread(() => { uid.dispatcher = Dispatcher.CurrentDispatcher; uid.dispatcher.UnhandledException += BTSApplicationBootstrapper.CurrentDispatcher_HandleClipboardError; - System.Windows.Interop.ComponentDispatcher.ThreadFilterMessage += (ref System.Windows.Interop.MSG m,ref bool h) => ComponentDispatcher_ThreadFilterMessage(uid, ref m, ref h); + ComponentDispatcher.ThreadFilterMessage += (ref MSG m,ref bool h) => ComponentDispatcher_ThreadFilterMessage(uid, ref m, ref h); try { Dispatcher.Run(); } @@ -62,7 +62,7 @@ namespace mbts.ui.shell return uid; } - private void ComponentDispatcher_ThreadFilterMessage(UIThreadData d, ref System.Windows.Interop.MSG msg, ref bool handled) { + private void ComponentDispatcher_ThreadFilterMessage(UIThreadData d, ref MSG msg, ref bool handled) { d.last_msg = msg; // We definitely don't need to reload themes on background threads @@ -75,7 +75,6 @@ namespace mbts.ui.shell private Dispatcher attach_window(UIThreadData uid, ISlowWindow window) { uid.dispatcher.BeginInvoke(DispatcherPriority.Send, (Action)(() => { - lock(uid.windows) uid.windows.Add(window); window.thread_init(); })); return uid.dispatcher; diff --git a/src/client/spark/view/Shell/ViewModels/ShellWindowVM.cs b/src/client/spark/view/Shell/ViewModels/ShellWindowVM.cs index c9ad138b0..62769397f 100644 --- a/src/client/spark/view/Shell/ViewModels/ShellWindowVM.cs +++ b/src/client/spark/view/Shell/ViewModels/ShellWindowVM.cs @@ -29,8 +29,8 @@ namespace mbts.ui.shell public ShellWindowVM(IShellWindow model, IWindowManager wm, IShellThreadFactory threads, string host = "") { Log.assert(model != null); _model = model; - _model.TitleChanged += () => { if (!HasCustomTitle) RaisePropertyChanged("Title"); }; - _model.IconChanged += () => { _icon = null; RaisePropertyChanged("Icon"); }; + _model.TitleChanged += title_changed; + _model.IconChanged += icon_changed; _wm = wm; host_id = host; @@ -46,6 +46,16 @@ namespace mbts.ui.shell _edit_mode = backing(nameof(EditMode), false); } + void title_changed() { + if (!HasCustomTitle) { + RaisePropertyChanged("Title"); + } + } + void icon_changed() { + _icon = null; + RaisePropertyChanged("Icon"); + } + public string host_id { get; set; } public Dispatcher Dispatcher { get { return _dispatcher; } } @@ -208,6 +218,9 @@ namespace mbts.ui.shell public void Dispose() { + _model.TitleChanged -= title_changed; + _model.IconChanged -= icon_changed; + if (IsShared) { // Shared threads continue running _dispatcher.Invoke(() => Disposable.dispose(ref _model)); @@ -221,6 +234,7 @@ namespace mbts.ui.shell Disposable.dispose(ref _model); } + _ui = null; Disposable.dispose(ref _hwnd_host); } diff --git a/src/client/spark/view/Shell/WindowManager.cs b/src/client/spark/view/Shell/WindowManager.cs index 5b91bbc9d..02443e249 100644 --- a/src/client/spark/view/Shell/WindowManager.cs +++ b/src/client/spark/view/Shell/WindowManager.cs @@ -31,11 +31,13 @@ namespace mbts.ui.shell { readonly Lazy _bookmarks; IDisposable _dispose; object _lock = new object(); + readonly IBus _bus; [ImportingConstructor] public WindowManager( IShellThreadFactory threads, Lazy settings, ISavedWindowFactory factory, Lazy bookmarks, IBus bus) { + _bus = bus; _threads = threads; _window_settings = settings; _window_factory = factory; @@ -92,11 +94,15 @@ namespace mbts.ui.shell { public IReadOnlyList list_documents() => _documents.Values.ToList(); public async Task add(IShellWindow window) { - if (!Application.Current.Dispatcher.CheckAccess()) - await Application.Current.Dispatcher.InvokeAsync(() => add(window)); - Log.Ui.info($"Opening window {window.diagnostic_name()}."); - lock (_lock) { - _documents[window] = _create_document(window); + if (window != null) { + if (!Application.Current.Dispatcher.CheckAccess()) + await Application.Current.Dispatcher.InvokeAsync(() => add(window)); + Log.Ui.info($"Opening window {window.diagnostic_name()}."); + lock (_lock) { + _documents[window] = _create_document(window); + } + // Prevent the bus from holding on to a reference to the window + _bus.post(SparkTags.ShowWindow, null); } } diff --git a/src/client/spark/view/Spark/Ladder/LadderGridHost.cs b/src/client/spark/view/Spark/Ladder/LadderGridHost.cs index c6c249fd3..f2248f4e1 100644 --- a/src/client/spark/view/Spark/Ladder/LadderGridHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderGridHost.cs @@ -73,6 +73,10 @@ namespace mbts.spark { }; RecenterCommand = new DelegateCommand(_scroll_to_center); DataContextChanged += (s, e) => _connect_vm(); + Unloaded += (s, e) => { + Disposable.dispose(ref _settings_sub); + Disposable.dispose(ref _tick_sub); + }; } enum ColumnType { Order, Bid, Price, Ask, Last, None } diff --git a/src/client/spark/view/Spark/SparkWindowView.xaml.cs b/src/client/spark/view/Spark/SparkWindowView.xaml.cs index ca9dfe72e..743f62b60 100644 --- a/src/client/spark/view/Spark/SparkWindowView.xaml.cs +++ b/src/client/spark/view/Spark/SparkWindowView.xaml.cs @@ -36,7 +36,7 @@ namespace bts.view { _menu.ShowText = false; _grid.Children.Add(_menu); if (ContextMenu != null) { - ContextMenu.ItemsSource = commands.Select(c => new SparkCommandVM(c, bus)); + ContextMenu.ItemsSource = commands.Select(c => new SparkCommandVM(c, bus)).ToList(); } } else { expand_button.Visibility = Visibility.Collapsed;