From f8ddaab88464fac15fb145c537232da94ab3a22e Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 9 May 2019 18:00:12 -0500 Subject: [PATCH] OrderBook - (Root)OrderType col filters show green beaker when filter active on startup/load workspace --- .../Filters/VM/DiscreteValuesFilterVM.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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 5d9eb34e4..fbc33e8e5 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs @@ -262,7 +262,7 @@ namespace mbts.spark.filters { readonly Func> _load_state; readonly Func, TState> _get_state; readonly IEqualityComparer _comparer; - readonly HashSet _selected_keys = new HashSet(); + readonly HashSet _selected_keys = new HashSet(), _desired_keys = new HashSet(); ListCollectionView _items_view; public TableUpdateItemsFilter(Func factory, Func row_key, Func key, Func> load_state, Func, TState> get_state) @@ -290,6 +290,12 @@ namespace mbts.spark.filters { _items.Replace(_key(ch.Old), ch.New); foreach (var v in table.added) _items.Add(v); + var newly_selected_keys = _desired_keys.Where(_selection_model.try_select).ToList(); + if (newly_selected_keys.Count > 0) { + _selected_keys.AddRange(newly_selected_keys); + _desired_keys.removeRange(newly_selected_keys); + _raise_filter_changed(); + } } public override TState get_state() => _get_state(_selection_model.selected_items.Select(_key)); @@ -309,8 +315,10 @@ namespace mbts.spark.filters { protected override bool _filter(TValue value) => _selected_keys.Contains(_key(value)); protected override void _load_state_internal(TState state) { - foreach (var k in _load_state(state).empty_if_null()) - _selection_model.try_select(k); + foreach (var k in _load_state(state).empty_if_null()) { + if (!_selection_model.try_select(k)) + _desired_keys.Add(k); + } } } #endregion @@ -337,4 +345,4 @@ namespace mbts.spark.filters { } } } -} \ No newline at end of file +}