OrderBook - (Root)OrderType col filters show green beaker when filter active on startup/load workspace
This commit is contained in:
1 parent
78373c61ce
commit
f8ddaab884
1 file changed
+12
-4
@@ -262,7 +262,7 @@ namespace mbts.spark.filters {
|
||||
readonly Func<TState, IEnumerable<TKey>> _load_state;
|
||||
readonly Func<IEnumerable<TKey>, TState> _get_state;
|
||||
readonly IEqualityComparer<TValue> _comparer;
|
||||
readonly HashSet<TKey> _selected_keys = new HashSet<TKey>();
|
||||
readonly HashSet<TKey> _selected_keys = new HashSet<TKey>(), _desired_keys = new HashSet<TKey>();
|
||||
ListCollectionView<TValue> _items_view;
|
||||
|
||||
public TableUpdateItemsFilter(Func<TRow, TValue> factory, Func<TRow, TKey> row_key, Func<TValue, TKey> key, Func<TState, IEnumerable<TKey>> load_state, Func<IEnumerable<TKey>, 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 {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user