From f0ba6b72fcd4e7953ccf396bd9ce774286d517e6 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 14 Dec 2018 10:10:46 -0600 Subject: [PATCH] PR suggestions --- .../spark/view/Spark/Ladder/LadderSettingsVM.cs | 8 ++++---- src/client/spark/view/Spark/Ladder/LadderVM.cs | 11 ++--------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs b/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs index 9b20bdddb..773fc2f15 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs @@ -16,8 +16,8 @@ namespace mbts.spark { class LadderSettingsVM : ViewModelBase, IWindowSettingsVM, ITemplateSelectorKey { readonly Property _badge_style; readonly Property _alternate_order_size; - readonly double _order_entry_panel_width; readonly DelegateProperty _row_height; + Func _get_order_entry_panel_width; LadderSettings _current; LadderColumnSettingsVM _orders = new OrdersColumnSettingsVM(), @@ -51,14 +51,14 @@ namespace mbts.spark { _cancel_all_visibility = new OrderEntryPanelItemVisibilityVM("Cancel All"); - public LadderSettingsVM(bool is_synthetic, double left_panel_width) { + public LadderSettingsVM(bool is_synthetic, Func get_left_panel_width) { this.is_synthetic = is_synthetic; size_presets = new ObservableEditableCollection>(_create_size_preset_vm); size_presets.CollectionChanged += (s, e) => RaisePropertyChanged(nameof(size_presets_text)); _badge_style = backing(nameof(badge_style)); _badge_style.Changed += _badge_style_Changed; _alternate_order_size = backing(nameof(alternate_order_size)); - _order_entry_panel_width = left_panel_width; + _get_order_entry_panel_width = get_left_panel_width; // be sure to initialize backings before this measure_row_height call _row_height = backing(nameof(row_height), () => LadderRender.measure_row_height(get_result())); _orders.font_size_changed += on_font_size_changed; @@ -223,7 +223,7 @@ namespace mbts.spark { clone.cancel_buys_visible = _cancel_buys_visibility.show; clone.cancel_sells_visible = _cancel_sells_visibility.show; clone.cancel_all_visible = _cancel_all_visibility.show; - clone.order_entry_panel_initial_width = _order_entry_panel_width; + clone.order_entry_panel_initial_width = _get_order_entry_panel_width(); return clone; } diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index 3945933f0..cd5248fcd 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -94,7 +94,7 @@ namespace mbts.spark { var vm = new WindowSettingsDialogVM( settings_manager, s => s.ladder, UserSettings.FileExtensions.LADDER, s => { - var svm = new LadderSettingsVM(security.ContractCase == Security.ContractOneofCase.Synthetic, left_panel_width); + var svm = new LadderSettingsVM(security.ContractCase == Security.ContractOneofCase.Synthetic, () => left_panel_width); svm.load(s); return svm; }); @@ -283,14 +283,7 @@ namespace mbts.spark { if (_settings_manager.instance_settings == null) return null; var settings_clone = SparkUtils.clone_proto(_settings_manager.instance_settings); - settings_clone.default_order_type = order_properties_vm.selected_order_type?.order_type ?? settings_clone.default_order_type; - - // the user would need to have set some kind of customization in the - // main settings form first for instance settings to have been saved at some point. - // After which, it's possible they will adjust the panel width without explicitly - // going into the settings form again. - // Right now I will save this change ... - settings_clone.order_entry_panel_initial_width = left_panel_width; + settings_clone.default_order_type = order_properties_vm.selected_order_type?.order_type ?? settings_clone.default_order_type; return settings_clone; }