From 85447ccfb4f7db4940ce6da2a935caadae948e67 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 26 Apr 2019 17:35:34 -0500 Subject: [PATCH] CollectionViewSource - set CollectionViewType in default constructor --- .../view/Utility/CollectionViewSource.cs | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/client/spark/view/Utility/CollectionViewSource.cs b/src/client/spark/view/Utility/CollectionViewSource.cs index 823d299c9..ad36ee9de 100644 --- a/src/client/spark/view/Utility/CollectionViewSource.cs +++ b/src/client/spark/view/Utility/CollectionViewSource.cs @@ -1,18 +1,27 @@ -using System.ComponentModel; +using System; +using System.ComponentModel; using System.Windows.Data; namespace mbts.ui.utility { class CollectionViewSource : CollectionViewSource where TView : class, ICollectionView { - public CollectionViewSource() - : base() { } + public CollectionViewSource() : base() { + using (_init()) + CollectionViewType = typeof(TView); + } public CollectionViewSource(object source) { - ((ISupportInitialize)this).BeginInit(); - Source = source; - CollectionViewType = typeof(TView); - ((ISupportInitialize)this).EndInit(); + using (_init()) { + Source = source; + CollectionViewType = typeof(TView); + } } public new TView View => base.View as TView; + + IDisposable _init() { + var si = (ISupportInitialize)this; + si.BeginInit(); + return Disposable.Create(si.EndInit); + } } } \ No newline at end of file