diff --git a/src/client/spark/AW2/View/VolSurfaceView.xaml b/src/client/spark/AW2/View/VolSurfaceView.xaml
index 1bf8a3b65..4ad0dd1ba 100644
--- a/src/client/spark/AW2/View/VolSurfaceView.xaml
+++ b/src/client/spark/AW2/View/VolSurfaceView.xaml
@@ -184,6 +184,25 @@
+
+
+
+
+
diff --git a/src/client/spark/AW2/ViewModel/Grid/VolSurfaceColumn.cs b/src/client/spark/AW2/ViewModel/Grid/VolSurfaceColumn.cs
index 42470016f..a9912fff1 100644
--- a/src/client/spark/AW2/ViewModel/Grid/VolSurfaceColumn.cs
+++ b/src/client/spark/AW2/ViewModel/Grid/VolSurfaceColumn.cs
@@ -1,4 +1,5 @@
namespace mbts.spark.VolSurface {
+ using mbts.ui;
using mbts.ui.controls;
using mbts.ui.converters;
@@ -39,6 +40,7 @@ namespace mbts.spark.VolSurface {
}
static Thickness _cell_padding => new(4, 0, 4, 0);
+ static Thickness _header_cell_padding => new(6, 0, 4, 0);
IValueConverter _data_context_converter =>
ValueConverter.create(row => row?.get_cell(model));
@@ -52,11 +54,19 @@ namespace mbts.spark.VolSurface {
};
FrameworkElement row_header_cell() {
- var view = new TextBlock {
- FontWeight = FontWeights.Bold,
+ var text = new TextBlock {
+ HorizontalAlignment = HorizontalAlignment.Left,
+ Foreground = BTSColors.header_text.to_brush(),
};
- view.SetBinding(TextBlock.TextProperty, new Binding(nameof(VolSurfaceRowContext.expiration)));
- return view;
+ text.SetBinding(TextBlock.TextProperty, new Binding(nameof(VolSurfaceRowContext.expiration)));
+ var bd = new Border {
+ HorizontalAlignment = HorizontalAlignment.Stretch,
+ Padding = _header_cell_padding,
+ Background = BTSColors.header.to_brush(),
+ BorderThickness = new(0),
+ Child = text
+ };
+ return bd;
}
FrameworkElement read_only_cell() {
diff --git a/src/client/spark/AW2/ViewModel/Grid/VolSurfaceGridVM.cs b/src/client/spark/AW2/ViewModel/Grid/VolSurfaceGridVM.cs
index 3140922f1..69537c441 100644
--- a/src/client/spark/AW2/ViewModel/Grid/VolSurfaceGridVM.cs
+++ b/src/client/spark/AW2/ViewModel/Grid/VolSurfaceGridVM.cs
@@ -16,6 +16,7 @@
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Linq;
+ using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Input;
@@ -72,8 +73,8 @@
_columns_model);
VolSurfaceColumn create_exp_column_view() {
- var filter = new ComboCheckBox { HeaderContent = "Expirations" };
- filter.Foreground = Brushes.Black;
+ var filter = new ComboCheckBox();
+ filter.SetResourceReference(FrameworkElement.StyleProperty, "ExpirationFilterDropDown");
filter.SetBinding(ItemsControl.ItemsSourceProperty, new Binding(nameof(rows)) {
Source = this,
Mode = BindingMode.OneWay