diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index e953fbd33..febf85c3f 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -119,7 +119,7 @@ namespace mbts.spark { } } else if (e.ChangedButton == MouseButton.Left) { var curr_order = b.DataContext as LadderOrderVM; - if (curr_order != null && curr_order.cancel_command.CanExecute(null)) + if (curr_order?.modify_command?.CanExecute(null) == true) curr_order.cancel_command.Execute(null); } }; @@ -198,22 +198,9 @@ namespace mbts.spark { void _log(string msg) => Logger.diag(bts.log.Subsystem.Ui, $"{typeof(LadderGridHost)} {msg}"); void _orders_MouseRightButtonDown(object sender, MouseButtonEventArgs e) { - switch (e.ChangedButton) { - case MouseButton.Left: - _log("Mouse Down (L)"); - break; - case MouseButton.Right: - _log("Mouse Down (R)"); - goto begin_drag; - case MouseButton.Middle: - _log("Mouse Down (M)"); - break; - begin_drag: - var pt = e.GetPosition(_orders_host); - var order_view = _orders_host.ChildAtPoint(pt); - if (order_view != null) _begin_drag(order_view, pt); - break; - } + var pt = e.GetPosition(_orders_host); + var order_view = _orders_host.ChildAtPoint(pt); + if (order_view != null) _begin_drag(order_view, pt); } void _orders_PreviewGiveFeedback(object sender, GiveFeedbackEventArgs e) {