diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index ede771337..fdf4853da 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -33,9 +33,18 @@ namespace mbts.spark { readonly Property _orders_column_width, _bid_column_width, _price_column_width, _ask_column_width, _last_column_width, _volume_column_width, _piq_column_width; readonly Property _volume; readonly Property _auto_clear; - readonly PropertyAutoWrapper _show_day, _show_high, _show_low, _show_open, _show_settlement, _show_volume, _show_account, - _show_tif, _show_order_type, _show_size_preset, _show_auto_clear, _show_clear, _show_cancel_buys, - _show_cancel_sells, _show_cancel_all, _show_zoom, _show_status_message; + readonly PropertyAutoWrapper + _show_account, + _show_tif, + _show_order_type, + _show_size_preset, + _show_auto_clear, + _show_clear, + _show_cancel_buys, + _show_cancel_sells, + _show_cancel_all, + _show_zoom, + _show_status_message; readonly PropertyAutoWrapper _bid_background, _bid_foreground, _ask_background, _ask_foreground; double _position, @@ -108,12 +117,6 @@ namespace mbts.spark { (_ask_background = brush_prop(nameof(ask_background), s => s.ask_column.background)).set, (_ask_foreground = brush_prop(nameof(ask_foreground), s => s.ask_column.foreground)).set, // bool visibility props - (_show_day = bool_prop(nameof(show_day), s => s.day_visible)).set, - (_show_high = bool_prop(nameof(show_high), s => s.high_visible)).set, - (_show_low = bool_prop(nameof(show_low), s => s.low_visible)).set, - (_show_open = bool_prop(nameof(show_open), s => s.open_visible)).set, - (_show_settlement = bool_prop(nameof(show_settlement), s => s.settle_visible)).set, - (_show_volume = bool_prop(nameof(show_volume), s => s.volume_visible)).set, (_show_account = bool_prop(nameof(show_account), s => s.account_visible)).set, (_show_tif = bool_prop(nameof(show_tif), s => s.tif_visible)).set, (_show_order_type = bool_prop(nameof(show_order_type), s => s.order_type_visible)).set, @@ -146,11 +149,23 @@ namespace mbts.spark { _volume_column_width.set(s.volume_column.general.width); // left panel/zoom day_change_style.load_from(s.panel_price_point_settings.day_change); + day_change_style.show = s.day_visible; + // open open_style.load_from(s.panel_price_point_settings.open); + open_style.show = s.open_visible; + // session low session_low_style.load_from(s.panel_price_point_settings.session_low); + session_low_style.show = s.low_visible; + // session high session_high_style.load_from(s.panel_price_point_settings.session_high); + session_high_style.show = s.high_visible; + // settlement settlement_style.load_from(s.panel_price_point_settings.settlement); + settlement_style.show = s.settle_visible; + // volume volume_style.load_from(s.panel_price_point_settings.volume); + volume_style.show = s.volume_visible; + // left panel gen display _left_panel_width.set(s.order_entry_panel_initial_width); _zoom_factor.set(s.zoom_factor); RaisePropertyChanged(nameof(day_change_font_color), nameof(day_change_background_color)); @@ -324,12 +339,6 @@ namespace mbts.spark { public Brush bid_foreground => _bid_foreground.view; public Brush ask_background => _ask_background.view; public Brush ask_foreground => _ask_foreground.view; - public bool show_day => _show_day.view; - public bool show_high => _show_high.view; - public bool show_low => _show_low.view; - public bool show_open => _show_open.view; - public bool show_settlement => _show_settlement.view; - public bool show_volume => _show_volume.view; public bool show_account => _show_account.view; public bool show_tif => _show_tif.view; public bool show_order_type => _show_order_type.view; diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml index bebd4ee42..1bb407eae 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml @@ -372,7 +372,7 @@ @@ -402,7 +402,7 @@ @@ -431,7 +431,7 @@ @@ -460,7 +460,7 @@ @@ -489,7 +489,7 @@ @@ -519,7 +519,7 @@