PR suggestions

This commit is contained in:
Jake Norbut committed 2018-12-14 10:10:46 -06:00
1 parent bea84c03f7
commit f0ba6b72fc
2 files changed
+6 -13

No files matched your search

@@ -16,8 +16,8 @@ namespace mbts.spark {
class LadderSettingsVM : ViewModelBase, IWindowSettingsVM<LadderSettings>, ITemplateSelectorKey {
readonly Property<LadderSettings.BadgeStyle> _badge_style;
readonly Property<uint> _alternate_order_size;
readonly double _order_entry_panel_width;
readonly DelegateProperty<double> _row_height;
Func<double> _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<double> get_left_panel_width) {
this.is_synthetic = is_synthetic;
size_presets = new ObservableEditableCollection<IMutableValueWrapperVM<uint>>(_create_size_preset_vm);
size_presets.CollectionChanged += (s, e) => RaisePropertyChanged(nameof(size_presets_text));
_badge_style = backing<LadderSettings.BadgeStyle>(nameof(badge_style));
_badge_style.Changed += _badge_style_Changed;
_alternate_order_size = backing<uint>(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;
}
@@ -94,7 +94,7 @@ namespace mbts.spark {
var vm = new WindowSettingsDialogVM<LadderSettings, LadderSettingsVM>(
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;
}