diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs index e2b5b8139..e989ccde6 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs @@ -25,7 +25,6 @@ namespace mbts.spark { readonly TimeAndSalesModel _model; IWindowSettingsManager _settings_manager; - public TimeAndSalesVM(IBus bus, IWindowSettingsManager settings_manager, TimeAndSalesModel model, StartupData startup_data) : base(RXCollection.CreateBuffer(model.trades, 1000), Enumerable.Empty()) { _bus = bus; @@ -52,23 +51,26 @@ namespace mbts.spark { columns.Add(new RenderTextColumn(col_key, r => r[col_key], filter, filter_template, r => _get_aggressor_brush(r)) { id = col_id(col_key), Header = header, Width = width, sort_member_path = sort_member_path, horizontal_alignment = h_alignment } ); - + // be sure to load GridSettings AFTER the columns collection has been populated, the grid settings manager looks columns by id to apply the appropriate settings, // if the collection is not populated, the column settings will not be applied - grid_settings_manager = new SimpleGridSettingsManager(columns, new Dictionary { }, row_vms); + grid_settings_manager = new GridSettingsManager(columns); grid_settings_manager.load_from(settings_manager.current_settings()); _resources.AddRange( show_ladder, DataGridFilterHelper.hook_filters( rows_view, time_filter, security_filter, price_filter, size_filter, aggressor_filter, security_key_filter), - settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager) - ); + settings_manager.subscribe_current().OnDispatcher().Subscribe(s => { + grid_settings_manager.load_from(s); + foreach (var r in row_vms) + r.raise_invalidated(); + })); rows_view.set_sort_descriptions(startup_data.sorting_criterion, columns); } public ObservableCollection columns { get; } = new ObservableCollection(); public DelegateCommandParamObserver show_ladder { get; } - public SimpleGridSettingsManager grid_settings_manager { get; } + public GridSettingsManager grid_settings_manager { get; } public GridSettings get_grid_save_state() { if (_settings_manager.instance_settings == null) diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs index 85938778a..d4a1293b5 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs @@ -7,7 +7,6 @@ using mbts.co2; using mbts.persist; using mbts.ui; using mbts.ui.settings; -using mbts.ui.shell; using mbts.ui.spark; using mbts.ui.utility; using mbts.utils; @@ -70,16 +69,17 @@ namespace mbts.spark { SparkCommands.change_securities_command(() => (update_securities_cmd, _state.security_criteria)), // wrap the grid settings view factory in a dialogCommand here since the vm is destroyed/recreated when the security criteria changes SparkCommands.window_settings_command(new DialogCommand(() => { - var vm = new ShellSettingsDialogVM( - _settings_manager, - s => s.time_and_sales_grid, - UserSettings.FileExtensions.GRID, - s => _vm.value.grid_settings_manager.create_vm( - // we need to get the most up to date GridSettings when launching b/c users may - // have changed some settings on the grid directly, like column widths. - s.with(_vm.value.columns.Select(c => c.create())) - ) - ); + var vm = new ShellSettingsDialogVM( + _settings_manager, + s => s.time_and_sales_grid, + UserSettings.FileExtensions.GRID, + s => { + var gs_vm = _vm.value.grid_settings_manager.create_vm(); + // we need to get the most up to date GridSettings when launching b/c users may + // have changed some settings on the grid directly, like column widths. + gs_vm.load(s.with(_vm.value.columns.Select(c => c.create()))); + return gs_vm; + }); vm.SubscribeDisposed(literal_title_source.OnDispatcher().Subscribe(t => vm.title = t)); var dialog = new ShellSettingsDialog { DataContext = vm }; vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog);