From d37f3a4646641a3e513f88f810c883147ffca0cc Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 26 Apr 2019 07:58:49 -0500 Subject: [PATCH] Escape key when cursor in price or quantity now reverts changed value --- .../Modules/Trading/OrderBook/OrderBookColumns.cs | 2 ++ .../Modules/Trading/OrderBook/OrderBookRowVM.cs | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 15064ee59..09d68732d 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -1048,6 +1048,7 @@ namespace mbts.spark { tick_up_down.SetBinding(TickUpDownNullableUIntCommit.SourceValueProperty, nameof(OrderBookRowVM.prospective_quantity)); tick_up_down.SetBinding(TickUpDownNullableUIntCommit.OnCommitProperty, nameof(OrderBookRowVM.modify_order_quantity_andor_price)); tick_up_down.InputBindings.Add(_create_keyinput_binding(Key.Enter, nameof(OrderBookRowVM.modify_order_quantity_andor_price))); + tick_up_down.InputBindings.Add(_create_keyinput_binding(Key.Escape, nameof(OrderBookRowVM.revert_prospective_order_quantity_andor_price))); return tick_up_down; } } @@ -1066,6 +1067,7 @@ namespace mbts.spark { price_up_down.SetBinding(PriceEntryCommitControl.SourceContractSpecProperty, nameof(OrderBookRowVM.contract_spec)); price_up_down.SetBinding(PriceEntryCommitControl.OnCommitProperty, nameof(OrderBookRowVM.modify_order_quantity_andor_price)); price_up_down.InputBindings.Add(_create_keyinput_binding(Key.Enter, nameof(OrderBookRowVM.modify_order_quantity_andor_price))); + price_up_down.InputBindings.Add(_create_keyinput_binding(Key.Escape, nameof(OrderBookRowVM.revert_prospective_order_quantity_andor_price))); return price_up_down; } diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index cf06a1542..3e107f2cf 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -19,7 +19,7 @@ namespace mbts.spark { const int _unknown_security_price_num_fractional_digits = 9; readonly OrderBookVM _owner; Brush _badge_fill; - IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd, _detach_command, _attach_command, _update_command, _modify_order_quantity_andor_price; + IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd, _detach_command, _attach_command, _update_command, _modify_order_quantity_andor_price, _revert_prospective_order_quantity_andor_price; bool _is_parent, _is_expanded, _is_selected, _is_attachable, _is_detachable; int _depth_level; SecurityImmutable? _security => order_tuple.security; @@ -164,6 +164,16 @@ namespace mbts.spark { ) ); + public ICommand revert_prospective_order_quantity_andor_price => _revert_prospective_order_quantity_andor_price ?? + (_revert_prospective_order_quantity_andor_price = new DelegateCommand( + () => { + prospective_price = price; + prospective_quantity = quantity; + }, + () => this.status == OrderStatus.Working && (is_price_dirty || is_qty_dirty) + ) +); + public ICommand detach_command => _detach_command ?? (_detach_command = new DelegateCommand(() => { _owner.detach_orders(this);