From 0b11b83eb51690cd0f28ba63caf3f3834fcdf970 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 29 Apr 2022 00:09:05 -0400 Subject: [PATCH] ui: Refine slide win * dock account/risk terms to the left --- .../spark/Risk/Slide/SlideReportSettings.cs | 7 +- src/client/spark/Risk/Slide/SlideReportVM.cs | 13 +++- .../spark/Risk/Slide/SlideReportView.xaml | 75 ++++++------------- .../spark/Risk/Slide/SlideReportWindow.cs | 7 ++ 4 files changed, 47 insertions(+), 55 deletions(-) diff --git a/src/client/spark/Risk/Slide/SlideReportSettings.cs b/src/client/spark/Risk/Slide/SlideReportSettings.cs index 6cf4340ac..54aadd9fc 100644 --- a/src/client/spark/Risk/Slide/SlideReportSettings.cs +++ b/src/client/spark/Risk/Slide/SlideReportSettings.cs @@ -19,7 +19,8 @@ namespace mbts.analytics { public const int VERSION = 3; public static SlideReportSettings Default(int id = -1) => new() { - id = id + id = id, + show_upper_status_bar = true }; [ProtoMember(1)] @@ -43,6 +44,9 @@ namespace mbts.analytics { [ProtoMember(7)] public PriceDisplayFactors? price { get; set; } + [ProtoMember(9)] + public bool show_upper_status_bar { get; set; } + [ProtoMember(8)] public SparkMenuDisplaySettings menu_display { get; set; } = SparkMenuDisplaySettings.Default; @@ -54,6 +58,7 @@ namespace mbts.analytics { show_post_quarterly_sum == other.show_post_quarterly_sum && greeks.safe_sequence_equals(other.greeks) && price.safe_equals(other.price) && + show_upper_status_bar == other.show_upper_status_bar && menu_display.Equals(other.menu_display); public override bool Equals(object? obj) => diff --git a/src/client/spark/Risk/Slide/SlideReportVM.cs b/src/client/spark/Risk/Slide/SlideReportVM.cs index cc268bfda..1572bf8d6 100644 --- a/src/client/spark/Risk/Slide/SlideReportVM.cs +++ b/src/client/spark/Risk/Slide/SlideReportVM.cs @@ -14,6 +14,8 @@ namespace mbts.analytics { using mbts.ui.utility; using mbts.user.settings; + using Spark.ViewModel.Commands; + using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -45,9 +47,11 @@ namespace mbts.analytics { public SlideReportVM(SlideReportSettings startup_data, IBus bus) { _view_format = backing(nameof(view_format)); _use_candidate_values = backing(nameof(use_candidate_values)); + show_upper_status_bar = startup_data.show_upper_status_bar; var resources = new DisposableCombo(included_exps.Subscribe((s, e) => _set_ui_overrides())); _model = new SlideDataModel(startup_data.id, bus); + resources += toggle_show_upper_status_bar_cmd.bind(this, nameof(show_upper_status_bar)); resources += ObservableAutoWrapper.connect(_handles, columns, mk_col); resources += _view_format.Subscribe(_ => _sync_grid()); @@ -145,6 +149,11 @@ namespace mbts.analytics { public IObservable view_format_observable => _view_format.observe_current(true); + public bool show_upper_status_bar { + get => toggle_show_upper_status_bar_cmd.is_selected; + set => toggle_show_upper_status_bar_cmd.is_selected = value; + } + public TimeFilterTuple time_filter { get => _time_filter; set { @@ -223,6 +232,7 @@ namespace mbts.analytics { public ICommand compute => new Command(_model.calculate); public ICommand time_shift_value_tick_up => new Command(() => time_shift += 0.25); public ICommand time_shift_value_tick_down => new Command(() => time_shift -= 0.25); + public IToggleCommand toggle_show_upper_status_bar_cmd { get; } = new ToggleCommand(); public IDialogCommand launch_settings_editor_cmd { get; } public void cell_selection_changed( @@ -276,7 +286,8 @@ namespace mbts.analytics { id = id_override ?? _data.report_parameters.Id, view_format = view_format, greeks = _greeks_display_model.greek_displays.ToArray(), - price = _price_display + price = _price_display, + show_upper_status_bar = show_upper_status_bar }; static string _handle_key(double percent_handle_move) => diff --git a/src/client/spark/Risk/Slide/SlideReportView.xaml b/src/client/spark/Risk/Slide/SlideReportView.xaml index 9fce82b5c..0ac426407 100644 --- a/src/client/spark/Risk/Slide/SlideReportView.xaml +++ b/src/client/spark/Risk/Slide/SlideReportView.xaml @@ -102,39 +102,32 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + ItemTemplate="{StaticResource ExpirationItemTemplate}"> @@ -147,13 +140,7 @@ - + @@ -167,25 +154,7 @@ End="{Binding time_filter_end}" /> - - - - - +