diff --git a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml
index a780d03a3..efac3d4d7 100644
--- a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml
+++ b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml
@@ -310,7 +310,7 @@
-
+
diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs
index 560571dfa..a900e961c 100644
--- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs
+++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs
@@ -16,6 +16,7 @@ using System.Linq;
using System.Reactive.Linq;
using System.Reactive.Subjects;
using System.Windows.Data;
+using System.Windows.Media;
using static bts.api.orderman.Fill.Types;
using static bts.shell.FillsWindowFactory;
using static mbts.ui.controls.DIYGrid;
@@ -56,7 +57,7 @@ namespace mbts.spark {
add_col(Columns.Account, DefaultColumnHeaders.Account, r => r.account, nameof(Row.account), account_filter, DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.Account);
add_col(Columns.Exchange, DefaultColumnHeaders.Exchange, r => r.exchange.ToString(), nameof(Row.exchange), exchange_filter, DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.Exchange);
add_col(Columns.TimeInForce, DefaultColumnHeaders.TimeInForce, r => r.time_in_force.ToString(), nameof(Row.time_in_force), time_in_force_filter, DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.TimeInForce);
- columns.Add(new OrderTypeColumn(Columns.OrderType, new Binding(nameof(Row.order_type)), new Binding(nameof(Row.order_metadata)), order_type_filter) { id = col_id(Columns.OrderType), sort_member_path = nameof(Row.order_type) });
+ columns.Add(new OrderTypeColumn(Columns.OrderType, new Binding(nameof(Row.order_type)), new Binding(nameof(Row.badge_fill)), order_type_filter) { id = col_id(Columns.OrderType), sort_member_path = nameof(Row.order_type) });
columns.Add(new SideColumn(Columns.Side, r => r.side, side_filter) { id = col_id(Columns.Side), sort_member_path = nameof(Row.side) });
add_col(Columns.Size, DefaultColumnHeaders.Size, r => r.size.ToString(), nameof(Row.size), size_filter, DataGridFilterKnownTemplates.UIntMinMax, DefaultColumnWidths.Size);
add_col(Columns.Price, DefaultColumnHeaders.Price, r => r.format_price(r.price), nameof(Row.price), price_filter, DataGridFilterKnownTemplates.DoubleMinMax, DefaultColumnWidths.Price);
@@ -185,6 +186,7 @@ namespace mbts.spark {
readonly OrdersModel _model;
readonly FillImmutable _fill;
readonly OrderRecordImmutable _order;
+ Brush _badge_fill;
public Row(FillTuple fill_tuple, OrdersModel model) : base(fill_tuple.security_md.HasValue ? fill_tuple.security_md.Value.security : SecurityDataHelper.Defaults.SecurityImmutable) {
_fill = fill_tuple.fill;
@@ -197,6 +199,7 @@ namespace mbts.spark {
public TimeInForce time_in_force => _order.time_in_force();
public OrderType order_type => _order.order_type();
public OrderMetadata order_metadata => _model.factory.get_metadata(_order.Def.CustomDef.CustomCase);
+ public Brush badge_fill => _badge_fill ?? (_badge_fill = order_metadata.Color.rgb_brush());
public string account { get; private set; }
public string user => _order.user();
public Venue exchange => security.Exchange;
diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs
index 7f30e09f9..611c2ce93 100644
--- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs
+++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs
@@ -548,7 +548,7 @@ namespace mbts.spark {
public class OrderBookOrderTypeColumn : OrderTypeColumn, ICVOrderBookColumn {
ListSortDirection? _cached_sort_direction;
public OrderBookOrderTypeColumn(IDataGridColumnPersistentFilter filter)
- : base(Columns.OrderType, new Binding(nameof(OrderBookRowVM.order_type)), new Binding(nameof(OrderBookRowVM.order_metadata)), filter) {
+ : base(Columns.OrderType, new Binding(nameof(OrderBookRowVM.order_type)), new Binding(nameof(OrderBookRowVM.badge_fill)), filter) {
id = key.ToString();
this.filter = filter;
sort_member_path = nameof(OrderBookRowVM.order_type);
diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs
index 5a5213efd..563f29413 100644
--- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs
+++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs
@@ -7,12 +7,14 @@ using mbts.ui.controls;
using mbts.ui.shell;
using System;
using System.Windows.Input;
+using System.Windows.Media;
namespace mbts.spark {
partial class OrderBookRowVM : DisposableViewModelBase, IEquatable, DIYGrid.IRowVM, DIYGrid.IActionableRowVM {
const string _unknown_security_price_format_string = "0.#########";
const int _unknown_security_price_num_fractional_digits = 9;
readonly OrderBookVM _owner;
+ Brush _badge_fill;
IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd;
bool _is_parent, _is_expanded;
int _depth_level;
@@ -30,6 +32,7 @@ namespace mbts.spark {
public OrderRecordTuple order_tuple { get; private set; }
public OrderRecordImmutable order => order_tuple.order;
public OrderMetadata order_metadata => _owner.get_metadata(this);
+ public Brush badge_fill => _badge_fill ?? (_badge_fill = order_metadata.Color.rgb_brush());
public uint order_key => order.Key;
public uint parent_order_key => order.ParentKey;
public uint security_key => order.security_key();
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 ac2dce3f4..c3f5470bd 100644
--- a/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/OrderTypeColumn.cs
+++ b/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/OrderTypeColumn.cs
@@ -6,11 +6,11 @@ using System.Windows.Data;
namespace mbts.ui.controls {
partial class DIYGrid {
internal class OrderTypeColumn : FrameworkElementColumnBase, IFilterableColumn {
- readonly BindingBase _order_type_binding, _metadata_binding;
+ readonly BindingBase _order_type_binding, _badge_fill_binding;
- public OrderTypeColumn(TColKey key, BindingBase order_type_binding, BindingBase metadata_binding, IDataGridColumnFilter filter) : base(key) {
+ public OrderTypeColumn(TColKey key, BindingBase order_type_binding, BindingBase badge_fill_binding, IDataGridColumnFilter filter) : base(key) {
_order_type_binding = order_type_binding;
- _metadata_binding = metadata_binding;
+ _badge_fill_binding = badge_fill_binding;
this.filter = filter;
Header = DefaultColumnHeaders.OrderType;
Width = DefaultColumnWidths.OrderType;
@@ -27,7 +27,7 @@ namespace mbts.ui.controls {
VerticalContentAlignment = VerticalAlignment.Center
};
v.SetBinding(OrderTypeItem.OrderTypeProperty, _order_type_binding);
- v.SetBinding(OrderTypeItem.MetadataProperty, _metadata_binding);
+ v.SetBinding(OrderTypeItem.BadgeFillProperty, _badge_fill_binding);
if (font_weight_binding != null) {
v.SetBinding(FontWeightProperty, font_weight_binding);
} else {
diff --git a/src/client/spark/view/Controls/Order/AlgoPickerNodeView.xaml b/src/client/spark/view/Controls/Order/AlgoPickerNodeView.xaml
index 55c6dde54..bbae3354c 100644
--- a/src/client/spark/view/Controls/Order/AlgoPickerNodeView.xaml
+++ b/src/client/spark/view/Controls/Order/AlgoPickerNodeView.xaml
@@ -66,7 +66,7 @@
-
+
diff --git a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml
index 397e9a3b1..653622c1f 100644
--- a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml
+++ b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml
@@ -63,7 +63,7 @@
-
+
diff --git a/src/client/spark/view/Controls/Order/OrderTypeItem.xaml b/src/client/spark/view/Controls/Order/OrderTypeItem.xaml
index f84ebc61b..69782a126 100644
--- a/src/client/spark/view/Controls/Order/OrderTypeItem.xaml
+++ b/src/client/spark/view/Controls/Order/OrderTypeItem.xaml
@@ -28,7 +28,7 @@
@@ -26,9 +27,15 @@ namespace mbts.ui.spark {
set => SetValue(DisplayNameProperty, value);
}
- public static readonly DependencyProperty MetadataProperty = DependencyProperty.Register(nameof(Metadata), typeof(OrderMetadata), typeof(OrderTypeItem),
- new PropertyMetadata(new OrderMetadata { Color = 0, KeyBinding = string.Empty }));
- public OrderMetadata Metadata { get => GetValue(MetadataProperty) as OrderMetadata; set => SetValue(MetadataProperty, value); }
+ #region BadgeFill
+ public static readonly DependencyProperty BadgeFillProperty =
+ WPFHelper.create_dp(nameof(BadgeFill));
+
+ public Brush BadgeFill {
+ get => GetValue(BadgeFillProperty) as Brush;
+ set => SetValue(BadgeFillProperty, value);
+ }
+ #endregion
string _display_name;
TextBlock _text;
diff --git a/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml b/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml
index ac78253aa..1acf7ddb4 100644
--- a/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml
+++ b/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml
@@ -632,7 +632,7 @@
-
+