diff --git a/src/client/spark/view/Controls/Badge.cs b/src/client/spark/view/Controls/Badge.cs index 086236602..18c91a916 100644 --- a/src/client/spark/view/Controls/Badge.cs +++ b/src/client/spark/view/Controls/Badge.cs @@ -23,7 +23,7 @@ namespace mbts.ui.controls { DefaultStyleKeyProperty.OverrideMetadata(typeof(Badge), new FrameworkPropertyMetadata(typeof(Badge))); WidthProperty.OverrideMetadata(typeof(Badge), new FrameworkPropertyMetadata(15.0)); HeightProperty.OverrideMetadata(typeof(Badge), new FrameworkPropertyMetadata(10.0)); - FontSizeProperty.OverrideMetadata(typeof(Badge), new FrameworkPropertyMetadata(4.0, FrameworkPropertyMetadataOptions.AffectsRender, update_text)); + FontSizeProperty.OverrideMetadata(typeof(Badge), new FrameworkPropertyMetadata(6.0, FrameworkPropertyMetadataOptions.AffectsRender, update_text)); ForegroundProperty.OverrideMetadata(typeof(Badge), new FrameworkPropertyMetadata(Brushes.White, update_text)); BackgroundProperty.OverrideMetadata(typeof(Badge), new FrameworkPropertyMetadata(Brushes.Transparent, FrameworkPropertyMetadataOptions.AffectsRender)); BorderThicknessProperty.OverrideMetadata(typeof(Badge), new FrameworkPropertyMetadata(new Thickness(1))); @@ -32,7 +32,7 @@ namespace mbts.ui.controls { } public Badge() { - FontSize = 4; + FontSize = 6; } public string Text { diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index c3f4544f4..e3a221de6 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -142,18 +142,18 @@ namespace mbts.spark { return b; } - WrapPanel get_panel(double price) { + Panel get_panel(double price) { if (_stacks.TryGetValue(price, out PriceCellComponents price_cell)) return price_cell.panel; else if (_price_list != null && !double.IsNaN(_row_height)) { - var panel = new WrapPanel() { - Orientation = Orientation.Horizontal, + var panel = new DockPanel() { + //Orientation = Orientation.Horizontal, MaxWidth = _col_width, //MaxHeight = _row_height, //ClipToBounds = true }; - var view_box = new Viewbox { Child = panel, Width = _col_width, Height = _row_height }; + var view_box = new Viewbox { Child = panel, Width = _col_width, Height = _row_height, Stretch = Stretch.Fill }; _position_view_box(view_box, price); _stacks[price] = new PriceCellComponents(view_box, panel); Children.Add(view_box); @@ -279,9 +279,9 @@ namespace mbts.spark { private class PriceCellComponents { public readonly Viewbox box; - public readonly WrapPanel panel; + public readonly Panel panel; - public PriceCellComponents(Viewbox box, WrapPanel panel) { + public PriceCellComponents(Viewbox box, Panel panel) { this.box = box; this.panel = panel; }