diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs index cb0c0c07f..c185e2825 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs @@ -1,4 +1,4 @@ -using bts; +using bts; using bts.utils; using mbts.ui; @@ -17,25 +17,24 @@ using System.Windows.Media; namespace mbts.spark { class LadderOrdersHost : Canvas { - LadderGridHost _parent; + readonly LadderGridHost _parent; + readonly HashSet _orders = new(); + readonly Dictionary _stacks = new(); DragDropAgent _drag_drop_agent; - Dictionary _stacks = new Dictionary(); - HashSet _orders = new HashSet(); double _row_height, _col_width; System.Windows.Controls.Primitives.Popup _currently_open_popup; - public LadderOrdersHost(LadderGridHost parent) { _parent = parent; AllowDrop = true; - Loaded += _loaded; - Unloaded += _unloaded; + Loaded += on_loaded; + Unloaded += on_unloaded; + + void on_loaded(object sender, RoutedEventArgs e) => _drag_drop_agent = new DragDropAgent(this, _parent); + void on_unloaded(object sender, RoutedEventArgs e) => Disposable.dispose(ref _drag_drop_agent); } - void _loaded(object sender, RoutedEventArgs e) => _drag_drop_agent = new DragDropAgent(this, _parent); - void _unloaded(object sender, RoutedEventArgs e) => Disposable.dispose(ref _drag_drop_agent); - - uint security_key => _parent.security.Id; + uint _security_key => _parent.security.Id; public void update_settings(double row_height, LadderColumnSettings settings) { _row_height = row_height; @@ -85,30 +84,23 @@ namespace mbts.spark { } } + public void close_open_popup() { + if (_currently_open_popup != null) { + _currently_open_popup.IsOpen = false; + } + } + void _add_order(LadderOrderVM order, double price) { if (_orders.Add(order)) { // listen for price changes order.PropertyChanged += _order_PropertyChanged; // get the stackpanel it belongs in - Panel panel = get_panel(price); - //var coords = GetAbsolutePlacement(panel, true); + Panel panel = _get_panel(price); // insert Badge and wire up DataContext if (panel != null) { - panel.Children.Add(mkbadge(order, panel)); + panel.Children.Add(_mkbadge(order, panel)); } - } //else { - //Log.Ui.warn($"Failed to add order ({order.id}): order already in {nameof(LadderGridHost)}'s {nameof(_orders)}."); - //} - } - - public static Rect GetAbsolutePlacement(FrameworkElement element, bool relativeToScreen = false) { - var absolutePos = element.PointToScreen(new System.Windows.Point(0, 0)); - if (relativeToScreen) { - return new Rect(absolutePos.X, absolutePos.Y, element.ActualWidth, element.ActualHeight); } - var posMW = Application.Current.MainWindow.PointToScreen(new System.Windows.Point(0, 0)); - absolutePos = new System.Windows.Point(absolutePos.X - posMW.X, absolutePos.Y - posMW.Y); - return new Rect(absolutePos.X, absolutePos.Y, element.ActualWidth, element.ActualHeight); } void _order_PropertyChanged(object sender, PropertyChangedEventArgs e) { @@ -119,11 +111,11 @@ namespace mbts.spark { } } - Badge mkbadge(LadderOrderVM order, UIElement popup_placement_target) { - Badge b = new Badge(); + Badge _mkbadge(LadderOrderVM order, UIElement popup_placement_target) { + Badge b = new(); b.DataContext = order; // Hook up the style from xaml - b.Style = this.TryFindResource(typeof(Badge)) as Style; + b.Style = TryFindResource(typeof(Badge)) as Style; b.MouseUp += async (s, e) => { var curr_order = b.DataContext as LadderOrderVM; if (e.ChangedButton == MouseButton.Middle) { @@ -180,28 +172,23 @@ namespace mbts.spark { return b; } - public void close_open_popup() { - if (_currently_open_popup != null) { - _currently_open_popup.IsOpen = false; - } - } - - Panel get_panel(double price) { + Panel _get_panel(double price) { if (_stacks.TryGetValue(price, out PriceCellComponents price_cell)) { _position_panel(price_cell, price); return price_cell.panel; - } else if (!double.IsNaN(_row_height)) { - var panel = new StackPanel() { - Margin = Badge.DefaultMargin, - Orientation = Orientation.Horizontal, - MaxWidth = _col_width - }; - price_cell = new PriceCellComponents(panel); - _position_panel(price_cell, price); - _stacks[price] = price_cell; - Children.Add(panel); - return panel; - } else return null; + } else if (double.IsNaN(_row_height)) { + return null; + } + var panel = new StackPanel() { + Margin = Badge.DefaultMargin, + Orientation = Orientation.Horizontal, + MaxWidth = _col_width + }; + price_cell = new PriceCellComponents(panel); + _position_panel(price_cell, price); + _stacks[price] = price_cell; + Children.Add(panel); + return panel; } void _position_panel(PriceCellComponents price_cell, double price) { @@ -214,18 +201,19 @@ namespace mbts.spark { #region Drag/Drop - void drop(DragEventArgs e) { - if (e.Data.GetDataPresent(typeof(LadderOrderVM))) { - LadderOrderVM vm = e.Data.GetData(typeof(LadderOrderVM)) as LadderOrderVM; - if (vm != null && vm.security_key == security_key) { - Log.Ui.info("Drop - " + vm.summary); - double price = _parent.price_for_point(e.GetPosition(_parent)); - if (price != vm.price) { - foreach (var order in vm.root_orders) { - vm.try_set_price(order, price); - } - } - } + void _drop(DragEventArgs e) { + if (!(e.Data.GetDataPresent(typeof(LadderOrderVM)) + && e.Data.GetData(typeof(LadderOrderVM)) is LadderOrderVM vm + && vm.security_key == _security_key)) { + return; + } + Log.Ui.info("Drop - " + vm.summary); + double price = _parent.price_for_point(e.GetPosition(_parent)); + if (price == vm.price) { + return; + } + foreach (var order in vm.root_orders) { + vm.try_set_price(order, price); } } @@ -285,7 +273,7 @@ namespace mbts.spark { void _grid_PreviewDrop(object sender, DragEventArgs e) { var pt = e.GetPosition(_orders_host); if (pt.X >= 0 && pt.X <= _orders_host.ActualWidth && pt.Y >= 0 && pt.Y <= _orders_host.ActualHeight) { - _orders_host.drop(e); + _orders_host._drop(e); e.Handled = true; } }