OrderBook - don't lose right-panel-width (when hidden) during attach-op

This commit is contained in:
John Colvin committed 2019-03-14 20:12:22 -05:00
1 parent 0d1eedc34a
commit cbc69ec5fd
2 files changed
+15 -14

No files matched your search

@@ -214,8 +214,9 @@ namespace mbts.spark {
RaisePropertyChanged(nameof(right_panel_width));
}
}
public double raw_right_panel_width => _raw_right_panel_width;
public double right_panel_width {
get => algo_editor_is_visible ? Math.Max(_raw_right_panel_width, _min_visible_right_panel_width) : 0;
get => algo_editor_is_visible ? Math.Max(raw_right_panel_width, _min_visible_right_panel_width) : 0;
set {
if (_raw_right_panel_width != value) {
_raw_right_panel_width = value;
@@ -264,7 +265,7 @@ namespace mbts.spark {
public OrderBookStartupData create() {
var (filters, sorting) = _columns.create();
var gs = grid_settings_manager.create();
return new OrderBookStartupData(filters, gs.general.with(sorting_criterion: sorting), _algo_editor_is_visible, _raw_right_panel_width, _raw_fills_slave_grid_height, fills_slave_grid_is_visible, gs.predicate_animations, use_defaults: _settings_manager.instance_settings == null);
return new OrderBookStartupData(filters, gs.general.with(sorting_criterion: sorting), _algo_editor_is_visible, raw_right_panel_width, _raw_fills_slave_grid_height, fills_slave_grid_is_visible, gs.predicate_animations, use_defaults: _settings_manager.instance_settings == null);
}
public void load_from(OrderBookStartupData state) {
@@ -651,4 +652,4 @@ namespace mbts.spark {
}
}
}
}
}
@@ -30,7 +30,7 @@ namespace mbts.spark {
vm.end_attaching += on_end_attaching;
vm.SubscribeDisposed(() => {
if (attach_op.HasValue) {
vm.right_panel_width = attach_op.Value.panel_width;
vm.right_panel_width = attach_op.Value.raw_right_panel_width;
vm.fills_slave_grid_is_visible = attach_op.Value.fills_slave_grid_is_visible;
}
vm.begin_attaching -= on_begin_attaching;
@@ -41,12 +41,12 @@ namespace mbts.spark {
// begin-attaching is already underway (prob won't happen in practice as this event is triggered by user interaction)
return;
}
attach_op = new AttachOp(vm.algo_editor_is_visible, vm.fills_slave_grid_is_visible, vm.right_panel_width);
attach_op = new AttachOp(vm.algo_editor_is_visible, vm.fills_slave_grid_is_visible, vm.raw_right_panel_width);
vm.fills_slave_grid_is_visible = false;
vm.algo_editor_is_visible = true;
double target_width = Math.Max(ActualWidth * AttachOrderParamsPanelWidthRatio, MinAttachOrderParamsPanelWidth);
if (vm.right_panel_width != target_width) {
foreach (double incr in _get_incremental_widths(attach_op.Value.algo_editor_is_visible ? attach_op.Value.panel_width : 0, target_width)) {
foreach (double incr in _get_incremental_widths(attach_op.Value.right_panel_is_visible ? attach_op.Value.raw_right_panel_width : 0, target_width)) {
vm.right_panel_width = incr;
await Task.Delay(delay_ms);
if (!attach_op.HasValue)
@@ -59,10 +59,10 @@ namespace mbts.spark {
// end-attaching is already underway (prob won't happen in practice as this event is triggered by user interaction)
return;
}
var incr_widths = _get_incremental_widths(vm.right_panel_width, attach_op.Value.panel_width);
vm.algo_editor_is_visible = attach_op.Value.algo_editor_is_visible;
var incr_widths = _get_incremental_widths(vm.right_panel_width, attach_op.Value.raw_right_panel_width);
vm.algo_editor_is_visible = attach_op.Value.right_panel_is_visible;
vm.fills_slave_grid_is_visible = attach_op.Value.fills_slave_grid_is_visible;
vm.right_panel_width = attach_op.Value.panel_width;
vm.right_panel_width = attach_op.Value.raw_right_panel_width;
attach_op = null;
foreach (double incr in incr_widths) {
vm.right_panel_width = incr;
@@ -96,13 +96,13 @@ namespace mbts.spark {
}
struct AttachOp {
public readonly bool algo_editor_is_visible, fills_slave_grid_is_visible;
public readonly double panel_width;
public readonly bool right_panel_is_visible, fills_slave_grid_is_visible;
public readonly double raw_right_panel_width;
public AttachOp(bool algo_editor_is_visible, bool fills_slave_grid_is_visible, double panel_width) {
this.algo_editor_is_visible = algo_editor_is_visible;
public AttachOp(bool right_panel_is_visible, bool fills_slave_grid_is_visible, double raw_right_panel_width) {
this.right_panel_is_visible = right_panel_is_visible;
this.fills_slave_grid_is_visible = fills_slave_grid_is_visible;
this.panel_width = panel_width;
this.raw_right_panel_width = raw_right_panel_width;
}
}