Browse Source

Don't fix size of TestContainer.

Instead let its size come from the data displayed by it (as would happen in the real world).
pull/2591/head
Steven Kirk 8 years ago
parent
commit
347a4eb0a1
  1. 15
      tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs

15
tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs

@ -15,6 +15,7 @@ using Avalonia.Input;
using Avalonia.Layout; using Avalonia.Layout;
using Avalonia.Platform; using Avalonia.Platform;
using Avalonia.Rendering; using Avalonia.Rendering;
using Avalonia.Styling;
using Avalonia.UnitTests; using Avalonia.UnitTests;
using Xunit; using Xunit;
@ -1034,7 +1035,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
{ {
Items = items, Items = items,
ItemsPanel = VirtualizingPanelTemplate(orientation), ItemsPanel = VirtualizingPanelTemplate(orientation),
ItemTemplate = ItemTemplate(), DataTemplates = { StringDataTemplate() },
VirtualizationMode = ItemVirtualizationMode.Simple, VirtualizationMode = ItemVirtualizationMode.Simple,
} }
}; };
@ -1043,7 +1044,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
return result; return result;
} }
private static IDataTemplate ItemTemplate() private static IDataTemplate StringDataTemplate()
{ {
return new FuncDataTemplate<string>(x => new Canvas return new FuncDataTemplate<string>(x => new Canvas
{ {
@ -1061,7 +1062,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
}); });
} }
private class TestScroller : ScrollContentPresenter, IRenderRoot, ILayoutRoot private class TestScroller : ScrollContentPresenter, IRenderRoot, ILayoutRoot, IStyleRoot
{ {
public IRenderer Renderer { get; } public IRenderer Renderer { get; }
public Size ClientSize { get; } public Size ClientSize { get; }
@ -1094,8 +1095,12 @@ namespace Avalonia.Controls.UnitTests.Presenters
{ {
public TestContainer() public TestContainer()
{ {
Width = 10; Template = new FuncControlTemplate<TestContainer>(parent => new ContentPresenter
Height = 10; {
Name = "PART_ContentPresenter",
[~ContentPresenter.ContentProperty] = parent[~ContentControl.ContentProperty],
[~ContentPresenter.ContentTemplateProperty] = parent[~ContentControl.ContentTemplateProperty],
});
} }
} }
} }

Loading…
Cancel
Save