diff --git a/src/client/spark/Modules/Trading/PNL/Settings/PNLSettings.cs b/src/client/spark/Modules/Trading/PNL/Settings/PNLSettings.cs index 542cc71ad..0790de406 100644 --- a/src/client/spark/Modules/Trading/PNL/Settings/PNLSettings.cs +++ b/src/client/spark/Modules/Trading/PNL/Settings/PNLSettings.cs @@ -100,7 +100,7 @@ namespace bts.shell.pnl { font_color = Colors.Black.rgb_color(), font_size = 12 }, - background = Colors.Transparent.rgb_color() + background = BTSColors.PNL.header_row_background_color.rgb_color() } }; @@ -220,11 +220,13 @@ namespace bts.shell.pnl { foreground: grid.font_color.rgb_color()); // Group + public Color group_background_color => group_cell_appearance.background?.argb_color() ?? Colors.Transparent; public PNLCellAppearanceProto group_cell_appearance { get => _group_cell_appearance ?? _grid_cell_appearance; set => _group_cell_appearance = value; } public IReadOnlyList group_columns => _group_columns ?? (_group_columns = DefaultColumns.group_columns.ToArray()); public PNLCellAppearance group_defaults => group_cell_appearance.to_appearance().merge(grid_defaults); public IReadOnlyList group_header_animations => _group_header_animations ?? (_group_header_animations = default_group_header_animations.ToArray()); // Header + public Color header_background_color => header_cell_appearance.background?.argb_color() ?? Colors.Transparent; public PNLCellAppearanceProto header_cell_appearance { get => _header_cell_appearance ?? _grid_cell_appearance; set => _header_cell_appearance = value; } public IReadOnlyList header_columns => _header_columns ?? (_header_columns = DefaultColumns.header_columns.ToArray()); public PNLCellAppearance header_defaults => header_cell_appearance.to_appearance().merge(grid_defaults); diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLHeaderRowVM.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLHeaderRowVM.cs index 9a841cdbd..1a82c990a 100644 --- a/src/client/spark/Modules/Trading/PNL/VM/PNLHeaderRowVM.cs +++ b/src/client/spark/Modules/Trading/PNL/VM/PNLHeaderRowVM.cs @@ -4,10 +4,11 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; using System.ComponentModel; +using System.Windows.Media; using ColumnKeys = bts.shell.pnl.PNLView.Columns; namespace bts.shell.pnl { - class PNLHeaderRowVM : IRaiseNotifyPropertyChanged, INotifyPropertyChanged { + class PNLHeaderRowVM : ViewModelBase, IRaiseNotifyPropertyChanged, INotifyPropertyChanged { static readonly IPropertyChangedDetector _change_detector = ObjectSnapshot.build_detector_except(nameof(data)); @@ -16,8 +17,14 @@ namespace bts.shell.pnl { ImmutableDictionary _default_appearances; IReadOnlyList> _triggers; PNLNormalizedData _data = PNLNormalizedData.zero; + Color _background_color; - public PNLHeaderRowVM(ImmutableDictionary default_appearances, IReadOnlyList> triggers) { + public PNLHeaderRowVM( + Color background_color, + ImmutableDictionary default_appearances, + IReadOnlyList> triggers) { + // + _background_color = background_color; _default_appearances = default_appearances; _triggers = triggers; _animator = new PNLCellEmbeddedAnimationModel(default_appearances, triggers); @@ -47,7 +54,6 @@ namespace bts.shell.pnl { total_short_pos = _cell_map.add_short_pos(ColumnKeys.TotalShortPos, d => d.total_short_pos); } - public event PropertyChangedEventHandler PropertyChanged; public event Action data_changed; public PNLNormalizedData data { @@ -62,6 +68,10 @@ namespace bts.shell.pnl { } } } + public Color background_color { + get => _background_color; + set => Set(ref _background_color, value); + } // day public PNLCellVM day_pnl { get; } @@ -87,14 +97,16 @@ namespace bts.shell.pnl { public PNLCellVM working_short_pos { get; } public PNLCellVM working_net_pos { get; } - public void on_settings(ImmutableDictionary default_appearances, IReadOnlyList> triggers) { + public void on_settings( + Color background_color, + ImmutableDictionary default_appearances, + IReadOnlyList> triggers) { + // + this.background_color = background_color; _default_appearances = default_appearances; _triggers = triggers; _animator.on_settings(_default_appearances, triggers); _cell_map.set_appearances(_animator.cell_appearances); } - - void IRaiseNotifyPropertyChanged.raise_notify_property_changed(string prop) => - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(prop)); } } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs index d287a9978..5287de92d 100644 --- a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs +++ b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs @@ -86,8 +86,8 @@ namespace bts.shell.pnl { foreach (var f in _all_filters) f.filter_changed += _refresh_filter.execute; // totals/selected headers - total_aggregate = new PNLHeaderRowVM(_default_header_appearances, _header_triggers); - selected_aggregate = new PNLHeaderRowVM(_default_header_appearances, _header_triggers); + total_aggregate = new PNLHeaderRowVM(settings.header_background_color, _default_header_appearances, _header_triggers); + selected_aggregate = new PNLHeaderRowVM(settings.header_background_color, _default_header_appearances, _header_triggers); // load/subscribe to data load_from(settings); _rows_view = new PNLRowCollectionView(rows, _default_group_appearances, _group_triggers); @@ -323,8 +323,8 @@ namespace bts.shell.pnl { _header_triggers = settings.header_triggers(); foreach (var r in rows) r.on_settings(_default_appearances, _triggers); - total_aggregate.on_settings(_default_header_appearances, _header_triggers); - selected_aggregate.on_settings(_default_header_appearances, _header_triggers); + total_aggregate.on_settings(settings.header_background_color, _default_header_appearances, _header_triggers); + selected_aggregate.on_settings(settings.header_background_color,_default_header_appearances, _header_triggers); void map_appearances(ref ImmutableDictionary from, IEnumerable col_settings, PNLCellAppearance fallback_appearance) { var dabd = from.ToBuilder(); foreach (var k in EnumHelper.get_values()) { diff --git a/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml b/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml index 0a3908587..aeb8bc31a 100644 --- a/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml +++ b/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml @@ -321,6 +321,7 @@ + @@ -414,6 +415,7 @@ + @@ -502,9 +504,6 @@ - - - - + + + + @@ -572,7 +574,10 @@ - + + + + diff --git a/src/client/spark/core/FontsAndColors/BTSColors.cs b/src/client/spark/core/FontsAndColors/BTSColors.cs index 6a4de85f2..e72fd9a97 100644 --- a/src/client/spark/core/FontsAndColors/BTSColors.cs +++ b/src/client/spark/core/FontsAndColors/BTSColors.cs @@ -148,6 +148,7 @@ namespace mbts.ui { public static Color anchor_color => Colors.Gold; public static Color profit_color => Colors.Green; public static Color loss_color => BTSColors.red; + public static Color header_row_background_color => 0xFFAAAAAA.argb_color(); } public static class Orders {