From 9862eb88bbe6ff375f58ff69eb7ea240a1bc2936 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 7 Apr 2019 16:52:39 -0500 Subject: [PATCH] FillsVMContainer - columns wrapper and internal fillsvm columns reflect each other's changes (full duplex) --- .../Modules/Trading/Fills/FillsVMContainer.cs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/client/spark/Modules/Trading/Fills/FillsVMContainer.cs b/src/client/spark/Modules/Trading/Fills/FillsVMContainer.cs index 48a165171..857add788 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVMContainer.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVMContainer.cs @@ -1,6 +1,8 @@ using mbts.ui; using mbts.ui.controls; +using mbts.ui.utility; using System; +using System.Collections.ObjectModel; namespace mbts.spark { /// @@ -9,6 +11,7 @@ namespace mbts.spark { class FillsVMContainer : IHandleGridSorting, IDisposable, IWillLetYouKnowWhenIDispose { bool _disposed; FillsVM _value; + IDisposable _columns_duplex; public event Action OnDisposed; @@ -18,20 +21,23 @@ namespace mbts.spark { if (value != _value) { if (_disposed) throw new ObjectDisposedException(nameof(FillsVMContainer)); - Disposable.replace(ref _value, value); + Disposable.dispose(ref _columns_duplex); if (_value != null) { - rows.add_collection(_value.rows); - columns.add_collection(_value.columns); - } else { + columns.Clear(); rows.clear_collections(); - columns.clear_collections(); + } + Disposable.dispose(ref _value); + _value = value; + if (_value != null) { + _columns_duplex = ObservableAutoWrapper.connect_two_way(_value.columns, columns); + rows.add_collection(_value.rows); } } } } public ObservableAggregateCollection rows { get; } = new ObservableAggregateCollection(); - public ObservableAggregateCollection columns { get; } = new ObservableAggregateCollection(); + public ObservableCollection columns { get; } = new ObservableCollection(); public void Dispose() { if (_disposed)