diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index 06e9102a3..e953fbd33 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -112,23 +112,10 @@ namespace mbts.spark { // Hook up the style from xaml b.Style = this.TryFindResource(typeof(Badge)) as Style; b.MouseUp += (s, e) => { - // open context menu on mid click, cancel order on left click if (e.ChangedButton == MouseButton.Middle) { - b.ContextMenu.DataContext = b.DataContext; - b.ContextMenu.IsOpen = true; - // close context menu after command executed var curr_order = b.DataContext as LadderOrderVM; - if (curr_order != null) { - Action command_executed = null; - command_executed = () => { - try { - b.ContextMenu.IsOpen = false; - curr_order.command_executed -= command_executed; - } catch (Exception ex) { - Logger.warn(bts.log.Subsystem.Ui, $"Error in {typeof(LadderGridHost)}'s {typeof(Badge)} {nameof(LadderOrderVM.command_executed)} local handler: {ex}"); - } - }; - curr_order.command_executed += command_executed; + if (curr_order != null && curr_order.modify_command.CanExecute(null)) { + curr_order.modify_command.Execute(null); } } else if (e.ChangedButton == MouseButton.Left) { var curr_order = b.DataContext as LadderOrderVM; @@ -136,8 +123,6 @@ namespace mbts.spark { curr_order.cancel_command.Execute(null); } }; - // block right click from opening context menu - b.ContextMenuOpening += (s, e) => e.Handled = true; return b; } diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml b/src/client/spark/view/Spark/Ladder/LadderView.xaml index 4960555d2..f34b99d70 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml @@ -433,22 +433,6 @@ - - - - - - - - - - - - - - - -