SPARK-653/SPARK-680 Make the Clear button exit the filter
This commit is contained in:
1 parent
1a88d99aed
commit
498d992661
5 files changed
+18
-2
No files matched your search
@@ -21,6 +21,7 @@ namespace mbts.spark.filters {
|
||||
public T? maximum { get => state.maximum.value; set => state.maximum.value = value; }
|
||||
|
||||
protected override void _clear() {
|
||||
_close();
|
||||
state.minimum.value = null;
|
||||
state.maximum.value = null;
|
||||
RaisePropertyChanged(nameof(minimum), nameof(maximum));
|
||||
|
||||
@@ -31,6 +31,7 @@ namespace mbts.spark.filters {
|
||||
public ICommand clear { get; }
|
||||
|
||||
public abstract TState get_state();
|
||||
|
||||
public void load_state(TState state) {
|
||||
_load_state_internal(state);
|
||||
_snapshot = detect_property_changes();
|
||||
@@ -41,6 +42,7 @@ namespace mbts.spark.filters {
|
||||
protected abstract bool _get_active();
|
||||
protected abstract bool _filter(TValue value);
|
||||
protected abstract void _load_state_internal(TState state);
|
||||
|
||||
protected virtual void _apply() {
|
||||
request_clear_focus?.Invoke((true, true));
|
||||
Disposable.dispose(ref _snapshot);
|
||||
@@ -52,6 +54,7 @@ namespace mbts.spark.filters {
|
||||
}
|
||||
_raise_filter_changed(true);
|
||||
}
|
||||
|
||||
protected virtual void _cancel() {
|
||||
if (_snapshot != null)
|
||||
_snapshot.revert = true;
|
||||
@@ -60,8 +63,10 @@ namespace mbts.spark.filters {
|
||||
open = false;
|
||||
RaisePropertyChanged(nameof(open));
|
||||
}
|
||||
|
||||
protected virtual void _clear() { }
|
||||
protected IDisposable _clear_properties() {
|
||||
|
||||
protected IDisposable _clear_properties(bool close=true) {
|
||||
_snapshot = null;
|
||||
var dpc = detect_property_changes();
|
||||
return Disposable.Create(() => {
|
||||
@@ -71,10 +76,17 @@ namespace mbts.spark.filters {
|
||||
_snapshot = detect_property_changes();
|
||||
});
|
||||
}
|
||||
protected virtual void _validate() { }
|
||||
|
||||
protected void _close() {
|
||||
open = false;
|
||||
RaisePropertyChanged(nameof(open));
|
||||
}
|
||||
|
||||
protected void _raise_filter_changed(bool notify_active_property_changed = true) {
|
||||
if (notify_active_property_changed) _active.refresh();
|
||||
filter_changed?.Invoke();
|
||||
}
|
||||
|
||||
protected virtual void _validate() { }
|
||||
}
|
||||
}
|
||||
@@ -27,6 +27,7 @@ namespace mbts.spark.filters {
|
||||
protected override bool _filter(string value) => _regex != null && _regex.IsMatch(value);
|
||||
protected override void _load_state_internal(string state) => text = state;
|
||||
protected override void _clear() {
|
||||
_close();
|
||||
_text = string.Empty;
|
||||
_regex = null;
|
||||
RaisePropertyChanged(nameof(text));
|
||||
|
||||
@@ -18,6 +18,7 @@ namespace mbts.spark.filters {
|
||||
model.security_criteria_clause_changed -= _on_security_criteria_clause_changed;
|
||||
|
||||
protected override void _clear() {
|
||||
_close();
|
||||
using (_clear_properties())
|
||||
_set_default_values();
|
||||
}
|
||||
|
||||
@@ -45,6 +45,7 @@ namespace mbts.spark.filters {
|
||||
}
|
||||
|
||||
protected override void _clear() {
|
||||
_close();
|
||||
using (_clear_properties())
|
||||
_set_default_values();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user