From dcbc6e756ea0bce95e20efcd0b44dbabc3d35805 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 22 Jan 2019 12:23:00 -0600 Subject: [PATCH] DIYGrid - adding dep prop to allow rows horizontal scrollbar to be strictly collapsed --- .../OrderBook/MiniOrderBook/MiniOrderBookView.xaml | 1 + src/client/spark/view/Controls/DIYGrid/DIYGrid.cs | 9 +++++++++ .../spark/view/Controls/DIYGrid/DIYGridResources.xaml | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index c0490da15..1ea742a44 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -76,6 +76,7 @@ RowStyle="{StaticResource {x:Static sp:OrderBookView.RowStyleKey}}" RowTemplate="{StaticResource {x:Static sp:OrderBookView.RowTemplateKey}}" SelectionHighlight="{Binding grid_settings_manager.selection_highlight, Mode=OneWay}" + RowsHorizontalScrollBarVisibility="Collapsed" > diff --git a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs index 50bd4cb93..93c209fd4 100644 --- a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs +++ b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs @@ -139,6 +139,7 @@ namespace mbts.ui.controls { public static readonly Thickness DefaultCellPadding = new Thickness(4, 2, 4, 2), AnimatableCellPadding = new Thickness(8, 2, 4, 2); + public static readonly Visibility DefaultRowsHorizontalScrollBarVisibility = Visibility.Visible; #region RoutedCommands public static readonly RoutedCommand SortCommand = new RoutedCommand(), DefaultRowCommand = new RoutedCommand(); @@ -695,6 +696,14 @@ namespace mbts.ui.controls { public static readonly DependencyProperty SelectionModeProperty = ListBox.SelectionModeProperty.AddOwner(typeof(DIYGrid)); + public Visibility RowsHorizontalScrollBarVisibility { + get { return (Visibility)GetValue(RowsHorizontalScrollBarVisibilityProperty); } + set { SetValue(RowsHorizontalScrollBarVisibilityProperty, value); } + } + + public static readonly DependencyProperty RowsHorizontalScrollBarVisibilityProperty = DependencyProperty.Register( + nameof(RowsHorizontalScrollBarVisibility), typeof(Visibility), typeof(DIYGrid), new PropertyMetadata(DefaultRowsHorizontalScrollBarVisibility)); + #endregion // Internal Methods diff --git a/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml b/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml index 0d77a7a05..ef1c6138b 100644 --- a/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml +++ b/src/client/spark/view/Controls/DIYGrid/DIYGridResources.xaml @@ -332,7 +332,7 @@ - +