diff --git a/samples/VirtualizationTest/MainWindow.xaml b/samples/VirtualizationTest/MainWindow.xaml index 55bd729fec..205e896fc8 100644 --- a/samples/VirtualizationTest/MainWindow.xaml +++ b/samples/VirtualizationTest/MainWindow.xaml @@ -21,6 +21,12 @@ + Horiz. ScrollBar + + Vert. ScrollBar + @@ -35,7 +41,9 @@ Items="{Binding Items}" SelectedItems="{Binding SelectedItems}" SelectionMode="Multiple" - VirtualizationMode="{Binding VirtualizationMode}"> + VirtualizationMode="{Binding VirtualizationMode}" + ScrollViewer.HorizontalScrollBarVisibility="{Binding HorizontalScrollBarVisibility, Mode=TwoWay}" + ScrollViewer.VerticalScrollBarVisibility="{Binding VerticalScrollBarVisibility, Mode=TwoWay}"> diff --git a/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs b/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs index f47627acb4..722af9e3af 100644 --- a/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs +++ b/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using Avalonia.Collections; using Avalonia.Controls; +using Avalonia.Controls.Primitives; using ReactiveUI; namespace VirtualizationTest.ViewModels @@ -17,6 +18,8 @@ namespace VirtualizationTest.ViewModels private int _newItemIndex; private IReactiveList _items; private string _prefix = "Item"; + private ScrollBarVisibility _horizontalScrollBarVisibility; + private ScrollBarVisibility _verticalScrollBarVisibility; private Orientation _orientation = Orientation.Vertical; private ItemVirtualizationMode _virtualizationMode = ItemVirtualizationMode.Simple; @@ -64,6 +67,21 @@ namespace VirtualizationTest.ViewModels public IEnumerable Orientations => Enum.GetValues(typeof(Orientation)).Cast(); + public ScrollBarVisibility HorizontalScrollBarVisibility + { + get { return _horizontalScrollBarVisibility; } + set { this.RaiseAndSetIfChanged(ref _horizontalScrollBarVisibility, value); } + } + + public ScrollBarVisibility VerticalScrollBarVisibility + { + get { return _verticalScrollBarVisibility; } + set { this.RaiseAndSetIfChanged(ref _verticalScrollBarVisibility, value); } + } + + public IEnumerable ScrollBarVisibilities => + Enum.GetValues(typeof(ScrollBarVisibility)).Cast(); + public ItemVirtualizationMode VirtualizationMode { get { return _virtualizationMode; }