Browse Source

Merge pull request #627 from AvaloniaUI/fixes/610-treeview-scrolling

Deafult ItemsPresenter virtualization to None
pull/639/head
danwalmsley 10 years ago
committed by GitHub
parent
commit
1c4228b17f
  1. 3
      src/Avalonia.Controls/ListBox.cs
  2. 2
      src/Avalonia.Controls/Presenters/ItemsPresenter.cs
  3. 1
      tests/Avalonia.Controls.UnitTests/ListBoxTests.cs

3
src/Avalonia.Controls/ListBox.cs

@ -42,7 +42,7 @@ namespace Avalonia.Controls
/// <summary> /// <summary>
/// Defines the <see cref="VirtualizationMode"/> property. /// Defines the <see cref="VirtualizationMode"/> property.
/// </summary> /// </summary>
public static readonly AvaloniaProperty<ItemVirtualizationMode> VirtualizationModeProperty = public static readonly StyledProperty<ItemVirtualizationMode> VirtualizationModeProperty =
ItemsPresenter.VirtualizationModeProperty.AddOwner<ListBox>(); ItemsPresenter.VirtualizationModeProperty.AddOwner<ListBox>();
private IScrollable _scroll; private IScrollable _scroll;
@ -53,6 +53,7 @@ namespace Avalonia.Controls
static ListBox() static ListBox()
{ {
ItemsPanelProperty.OverrideDefaultValue<ListBox>(DefaultPanel); ItemsPanelProperty.OverrideDefaultValue<ListBox>(DefaultPanel);
VirtualizationModeProperty.OverrideDefaultValue<ListBox>(ItemVirtualizationMode.Simple);
} }
/// <summary> /// <summary>

2
src/Avalonia.Controls/Presenters/ItemsPresenter.cs

@ -20,7 +20,7 @@ namespace Avalonia.Controls.Presenters
public static readonly StyledProperty<ItemVirtualizationMode> VirtualizationModeProperty = public static readonly StyledProperty<ItemVirtualizationMode> VirtualizationModeProperty =
AvaloniaProperty.Register<ItemsPresenter, ItemVirtualizationMode>( AvaloniaProperty.Register<ItemsPresenter, ItemVirtualizationMode>(
nameof(VirtualizationMode), nameof(VirtualizationMode),
defaultValue: ItemVirtualizationMode.Simple); defaultValue: ItemVirtualizationMode.None);
private ItemVirtualizer _virtualizer; private ItemVirtualizer _virtualizer;

1
tests/Avalonia.Controls.UnitTests/ListBoxTests.cs

@ -164,6 +164,7 @@ namespace Avalonia.Controls.UnitTests
Name = "PART_ItemsPresenter", Name = "PART_ItemsPresenter",
[~ItemsPresenter.ItemsProperty] = parent.GetObservable(ItemsControl.ItemsProperty).AsBinding(), [~ItemsPresenter.ItemsProperty] = parent.GetObservable(ItemsControl.ItemsProperty).AsBinding(),
[~ItemsPresenter.ItemsPanelProperty] = parent.GetObservable(ItemsControl.ItemsPanelProperty).AsBinding(), [~ItemsPresenter.ItemsPanelProperty] = parent.GetObservable(ItemsControl.ItemsPanelProperty).AsBinding(),
[~ItemsPresenter.VirtualizationModeProperty] = parent.GetObservable(ListBox.VirtualizationModeProperty).AsBinding(),
} }
}); });
} }

Loading…
Cancel
Save