diff --git a/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs b/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs index 9e89669fe..e36da3ebc 100644 --- a/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs +++ b/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs @@ -26,11 +26,19 @@ namespace mbts.ui.spark if (_is_selected != value) { _is_selected = value; IsSelectedChanged?.Invoke(security, value); + _is_selected_changed?.Invoke(value); RaisePropertyChanged(); } } } public event Action IsSelectedChanged; + + event Action _is_selected_changed; + event Action ISelectable.is_selected_changed { + add => _is_selected_changed += value; + remove => _is_selected_changed -= value; + } + public override int GetHashCode() { return security.Id.GetHashCode(); } } } diff --git a/src/client/spark/view/Utility/ISelectable.cs b/src/client/spark/view/Utility/ISelectable.cs index 72258df41..cfde501f1 100644 --- a/src/client/spark/view/Utility/ISelectable.cs +++ b/src/client/spark/view/Utility/ISelectable.cs @@ -1,11 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace mbts.ui { public interface ISelectable { + event Action is_selected_changed; bool is_selected { get; set; } } } diff --git a/src/client/spark/view/Utility/SelectableViewModelBase.cs b/src/client/spark/view/Utility/SelectableViewModelBase.cs index 69e19c683..02950988f 100644 --- a/src/client/spark/view/Utility/SelectableViewModelBase.cs +++ b/src/client/spark/view/Utility/SelectableViewModelBase.cs @@ -1,24 +1,24 @@ using mbts.utils; using System; -using System.Collections; using System.Collections.Generic; using System.Globalization; using System.Reactive.Linq; -namespace mbts.ui.shell -{ - public abstract class SelectableViewModelBase : ViewModelBaseWithValidation, ISelectable - { +namespace mbts.ui.shell { + public abstract class SelectableViewModelBase : ViewModelBaseWithValidation, ISelectable { protected SelectableViewModelBase() { _is_selected = backing(nameof(is_selected), false); + _is_selected.Changed += (oldval, newval) => is_selected_changed?.Invoke(newval); } private readonly Property _is_selected; + + public event Action is_selected_changed; + public bool is_selected { get => _is_selected.Value; set => _is_selected.set(value); } public IObservable observe_is_selected() { return _is_selected.Select(vals => vals.newval); } } - public class SelectableViewModelBase : SelectableViewModelBase, IComparable>, IComparable, IFormattable - { + public class SelectableViewModelBase : SelectableViewModelBase, IComparable>, IComparable, IFormattable { public SelectableViewModelBase() : this(default(T)) { } public SelectableViewModelBase(T initial_value) : this(initial_value, Comparer.Default) { } public SelectableViewModelBase(T initial_value, IComparer comparer) { @@ -36,4 +36,4 @@ namespace mbts.ui.shell public override string ToString() { return ToString(null, CultureInfo.CurrentCulture); } public string ToString(string format, IFormatProvider formatProvider) { return (value as IFormattable)?.ToString(format, formatProvider); } } -} \ No newline at end of file +}