diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index 956ec55c3..3a9e80c8d 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -203,6 +203,14 @@ namespace mbts.spark { _grid_host.PreviewDrop -= _grid_PreviewDrop; } + static Cursor _create_cursor(Badge badge) { + var sz = badge.RenderSize; + var dv = new DrawingVisual(); + using (var dc = dv.RenderOpen()) + dc.DrawRoundedRectangle(new VisualBrush(badge) { Stretch = Stretch.Uniform }, null, new Rect(sz), badge.CornerRadius, badge.CornerRadius); + return CursorHelper.create_cursor(dv, sz); + } + void _log(string msg) => Logger.diag(bts.log.Subsystem.Ui, $"{typeof(LadderGridHost)} {msg}"); void _orders_MouseDown(object sender, MouseButtonEventArgs e) { @@ -224,7 +232,7 @@ namespace mbts.spark { void _orders_PreviewGiveFeedback(object sender, GiveFeedbackEventArgs e) { if (e.Effects == DragDropEffects.Move) { if (_drag_cursor == null) - _drag_cursor = CursorHelper.create_cursor(_drag_view); + _drag_cursor = _create_cursor(_drag_view); if (_drag_cursor != null) { e.UseDefaultCursors = false; Mouse.SetCursor(_drag_cursor); diff --git a/src/client/spark/view/Utility/CursorHelper.cs b/src/client/spark/view/Utility/CursorHelper.cs index 998a39c6b..02dd670b7 100644 --- a/src/client/spark/view/Utility/CursorHelper.cs +++ b/src/client/spark/view/Utility/CursorHelper.cs @@ -24,14 +24,9 @@ namespace mbts.spark { return CursorInteropHelper.Create(cursor_handle); } - public static Cursor create_cursor(UIElement element) { - element.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity)); - element.Arrange(new Rect(new Point(), element.DesiredSize)); - var rtb = new RenderTargetBitmap( - (int)(element.DesiredSize.Width * _ppsi), (int)(element.DesiredSize.Height* _ppsi), - _ppsi * 2, _ppsi * 2, PixelFormats.Pbgra32 - ); - rtb.Render(element); + public static Cursor create_cursor(Visual visual, Size size) { + var rtb = new RenderTargetBitmap((int)size.Width, (int)size.Height, _ppsi, _ppsi, PixelFormats.Pbgra32); + rtb.Render(visual); var encoder = new PngBitmapEncoder(); encoder.Frames.Add(BitmapFrame.Create(rtb)); using (var ms = new MemoryStream()) {