diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs index 861292a4f..e42fc07c5 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs @@ -110,10 +110,11 @@ namespace mbts.spark.filters { class DynamicItemsFilter : FilterVMBase, IDisposable { readonly IEqualityComparer _equality_comparer; + readonly IComparer _comparer; readonly Func, TState> _get_state; readonly Func>> _load_state; readonly HashSet _items_set, _selected_items_set; - readonly ObservableCollection _unsorted_items; + readonly ObservableCollection _items = new ObservableCollection(); bool _override_desired_selection; IDisposable _desired_items_sub, _items_sub; @@ -129,7 +130,7 @@ namespace mbts.spark.filters { // _items_sub = items.OnDispatcher().Subscribe(new_items => { _items_set.SetItems(new_items.Concat(_selected_items_set)); - _unsorted_items.sync_with(_items_set); + _sync_items(); }); } @@ -148,7 +149,7 @@ namespace mbts.spark.filters { _items_set.Remove(v); foreach (var v in update.added) _items_set.Add(v); - _unsorted_items.sync_with(_items_set); + _sync_items(); }); } @@ -164,11 +165,11 @@ namespace mbts.spark.filters { _get_state = get_state; _load_state = load_state; _equality_comparer = equality_comparer; + _comparer = comparer; _selected_items_set = new HashSet(_equality_comparer); _items_set = new HashSet(_equality_comparer); - _unsorted_items = new ObservableCollection(); - items = comparer != null ? ObservableAutoWrapper.create_sorted_wrapper(_unsorted_items, comparer) : ObservableAutoWrapper.create_read_only_wrapper(_unsorted_items); selected_items.CollectionChanged += _on_selected_items_CollectionChanged; + _sync_items(); } public IReadOnlyObservableCollection items { get; } @@ -238,9 +239,11 @@ namespace mbts.spark.filters { var copy = new HashSet(_selected_items_set, _equality_comparer); _selected_items_set.SetItems(dsi); using (selected_items.SuspendHandler(_on_selected_items_CollectionChanged)) { - foreach (var item in _selected_items_set) { - if (_items_set.Add(item)) - _unsorted_items.Add(item); + var to_add = _selected_items_set.Where(_items_set.Add); + if (_comparer != null) { + _items.InsertSorted(to_add, _comparer); + } else { + _items.AddRange(to_add); } selected_items.sync_with(_selected_items_set); } @@ -248,6 +251,14 @@ namespace mbts.spark.filters { _raise_filter_changed(); } } + + void _sync_items() { + if (_comparer != null) { + _items.sync_with(_items_set); + } else { + _items.sync_with(_items_set.Ordered(_comparer)); + } + } } class TableUpdateItemsFilter : FilterVMBase, IObserver> where TKey : struct, IEquatable {