From 026bf6fb07e48b91af190f90a5aebf69a727e93e Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 12 Aug 2020 13:00:03 -0500 Subject: [PATCH] fix ColumnBase.SortDirection binding to DIYGridColumnModel --- src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs | 4 ++++ src/client/spark/view/Controls/DIYGrid/DIYGrid.cs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index 18184bf5c..44cc6569a 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -265,6 +265,10 @@ namespace mbts.ui.controls { get => GetValue(SortDirectionProperty) as ListSortDirection?; set => SetValue(SortDirectionProperty, value); } + ListSortDirection? ISortableDIYGridColumn.SortDirection { + get => SortDirection; + set => SetCurrentValue(SortDirectionProperty, value); + } #region IsVisible public static readonly DependencyProperty IsVisibleProperty = diff --git a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs index d4643f94e..cddc0a470 100644 --- a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs +++ b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs @@ -905,7 +905,7 @@ namespace mbts.ui.controls { if (cb is null) { cb = new DIYGridColumn { id = cm.id }; BindingOperations.SetBinding(cb, ColumnBase.HeaderProperty, new Binding(nameof(DIYGridColumnModel.header)) { Source = cm }); - BindingOperations.SetBinding(cb, ColumnBase.SortDirectionProperty, new Binding(nameof(DIYGridColumnModel.sort_direction)) { Source = cm }); + BindingOperations.SetBinding(cb, ColumnBase.SortDirectionProperty, new Binding(nameof(DIYGridColumnModel.sort_direction)) { Source = cm, Mode = BindingMode.TwoWay }); cb.set_model(cm); BindingOperations.SetBinding(cb, ColumnBase.IsVisibleProperty, new Binding(nameof(DIYGridColumnModel.is_visible)) { Source = cm }); if (cm is IFilterableColumn fc) {