diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookCell.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookCell.cs index 36c27d336..22d8b2808 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookCell.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookCell.cs @@ -47,7 +47,7 @@ namespace mbts.spark { where T : struct => new OrderBookCellStore(row, column, prop_name, get_value, select_other, format, CompareUtils.nullable_comparison(compare), EqualityComparer.CreateNullable(EqualityComparer.Default.Equals)); - class OrderBookCellStore : IOrderBookCellStore { + class OrderBookCellStore : IOrderBookCellStore, INotifyPropertyChanged { readonly OrderBookRowVM _row; readonly ICVOrderBookColumn _column; readonly string _prop_name; @@ -58,6 +58,10 @@ namespace mbts.spark { readonly IEqualityComparer _eq_comparer; OrderBookCell _current; + // Property changed handler to avoid WPF binding leak + // https://blog.jetbrains.com/dotnet/2014/09/04/fighting-common-wpf-memory-leaks-with-dotmemory/ + public event PropertyChangedEventHandler PropertyChanged = (_,__) => { }; + public OrderBookCellStore( OrderBookRowVM row, ICVOrderBookColumn column, diff --git a/src/client/spark/view/Controls/SparkMenu/SparkMenu.cs b/src/client/spark/view/Controls/SparkMenu/SparkMenu.cs index 3f71f7013..d79d2978e 100644 --- a/src/client/spark/view/Controls/SparkMenu/SparkMenu.cs +++ b/src/client/spark/view/Controls/SparkMenu/SparkMenu.cs @@ -1,6 +1,7 @@ using bts.api; using bts.spark; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Windows; using System.Windows.Controls; @@ -14,9 +15,10 @@ namespace mbts.ui.controls { SetCurrentValue(FocusableProperty, false); } - + public SparkMenu(IEnumerable commands, IBus bus) : this() => - ItemsSource = commands.Select(c => new SparkCommandVM(c, bus)).ToList(); + // ObservableCollection to avoid WPF Binding Leak + ItemsSource = new ObservableCollection(commands.Select(c => new SparkCommandVM(c, bus))); public bool ShowText { get { return (bool)GetValue(ShowTextProperty); } diff --git a/src/client/spark/view/Spark/SparkWindowView.xaml.cs b/src/client/spark/view/Spark/SparkWindowView.xaml.cs index 743f62b60..fbd9bf5e5 100644 --- a/src/client/spark/view/Spark/SparkWindowView.xaml.cs +++ b/src/client/spark/view/Spark/SparkWindowView.xaml.cs @@ -16,6 +16,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; using mbts.ui; +using System.Collections.ObjectModel; namespace bts.view { public partial class SparkWindowView : UserControl { @@ -36,7 +37,8 @@ namespace bts.view { _menu.ShowText = false; _grid.Children.Add(_menu); if (ContextMenu != null) { - ContextMenu.ItemsSource = commands.Select(c => new SparkCommandVM(c, bus)).ToList(); + // ObservableCollection to avoid WPF Binding Leak + ContextMenu.ItemsSource = new ObservableCollection(commands.Select(c => new SparkCommandVM(c, bus))); } } else { expand_button.Visibility = Visibility.Collapsed;