From f3266cbcec1bd64848ff073b7e404bf239ec5b2e Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 4 Sep 2018 14:41:28 -0400 Subject: [PATCH] SPARK-1691 correct order-type-columns' vertical alignment (present in fills and orderbook) --- .../OrderTypeColumn.cs | 6 +++- .../view/Controls/Order/OrderTypeItem.xaml | 30 ++++++++++++++++--- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/OrderTypeColumn.cs b/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/OrderTypeColumn.cs index d555fd895..ac2dce3f4 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/OrderTypeColumn.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/OrderTypeColumn.cs @@ -21,7 +21,11 @@ namespace mbts.ui.controls { public BindingBase font_weight_binding { get; set; } public override FrameworkElement view_factory() { - var v = new OrderTypeItem { FontFamily = font_family }; + var v = new OrderTypeItem { + FontFamily = font_family, + VerticalAlignment = VerticalAlignment.Center, + VerticalContentAlignment = VerticalAlignment.Center + }; v.SetBinding(OrderTypeItem.OrderTypeProperty, _order_type_binding); v.SetBinding(OrderTypeItem.MetadataProperty, _metadata_binding); if (font_weight_binding != null) { diff --git a/src/client/spark/view/Controls/Order/OrderTypeItem.xaml b/src/client/spark/view/Controls/Order/OrderTypeItem.xaml index 2eafa6a61..b0c58c496 100644 --- a/src/client/spark/view/Controls/Order/OrderTypeItem.xaml +++ b/src/client/spark/view/Controls/Order/OrderTypeItem.xaml @@ -9,14 +9,36 @@ - - + + - - + +