From bde83aa111f49f28f12e1860814ef7ebbfe8c7d2 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 26 Feb 2018 16:00:08 -0500 Subject: [PATCH] SPARK-524: Change ladder badge --- src/client/spark/view/Controls/Badge.cs | 7 +++++-- src/client/spark/view/Spark/Ladder/LadderView.xaml | 5 ++--- src/client/spark/view/Spark/Ladder/OrderVM.cs | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/client/spark/view/Controls/Badge.cs b/src/client/spark/view/Controls/Badge.cs index 0ed5d44b6..00ec32469 100644 --- a/src/client/spark/view/Controls/Badge.cs +++ b/src/client/spark/view/Controls/Badge.cs @@ -32,7 +32,7 @@ namespace mbts.ui.controls { } public Badge() { - FontSize = 8; + FontSize = 4; } public string Text { @@ -107,13 +107,16 @@ namespace mbts.ui.controls { double border_thickness = BorderThickness.Top; var pen = new Pen(BorderBrush, border_thickness); dc.DrawRoundedRectangle(Background, pen, new Rect(0, 0, ActualWidth, ActualHeight), CornerRadius, CornerRadius); - if (_center_text != null && _center_text.Width < ActualWidth) { + if (_center_text != null) { + _center_text.SetFontSize(FontSize); dc.DrawText(_center_text, new Point((ActualWidth-_center_text.Width)/2, (ActualHeight-_center_text.Height)/2)); } if (_top_text != null) { + _top_text.SetFontSize(FontSize); dc.DrawText(_top_text, new Point(border_thickness, 0.0)); } if (_bottom_text != null) { + _bottom_text.SetFontSize(FontSize); dc.DrawText(_bottom_text, new Point(border_thickness, ActualHeight - _bottom_text.Height)); } } diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml b/src/client/spark/view/Spark/Ladder/LadderView.xaml index 313734581..0886d7758 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml @@ -1,4 +1,4 @@ - - - + diff --git a/src/client/spark/view/Spark/Ladder/OrderVM.cs b/src/client/spark/view/Spark/Ladder/OrderVM.cs index 248a7de48..b90de942a 100644 --- a/src/client/spark/view/Spark/Ladder/OrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/OrderVM.cs @@ -77,8 +77,8 @@ namespace mbts.spark { public double real_price => _real_price; public Side side => _order.Def.Side; - public string text => ""; string _buy_sell_indicator => _order.Def.Side == Side.Buy ? "B" : "S"; + public string text => $"{OrderUtils.filled(_order)}/{_order.working_quantity()}"; public string line1 => $"{_buy_sell_indicator}:{OrderUtils.filled(_order)}"; public string line2 => $"W:{_order.working_quantity()}";