tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into datagridBackgroundfix

pull/3535/head
Steven Kirk 6 years ago
committed by GitHub
parent
a732ae64e8 c0a903c3d2
commit
536b58f4cf
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      src/Avalonia.Controls/ItemsControl.cs
  2. 46
      tests/Avalonia.Controls.UnitTests/CarouselTests.cs
  3. 32
      tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs

39
src/Avalonia.Controls/ItemsControl.cs
View File

@ -236,25 +236,7 @@ namespace Avalonia.Controls
// it was added to the Items collection. // it was added to the Items collection.
if (container.ContainerControl != null && container.ContainerControl != container.Item) if (container.ContainerControl != null && container.ContainerControl != container.Item)
{ {
if (ItemContainerGenerator.ContainerType == null) LogicalChildren.Add(container.ContainerControl);
{
var containerControl = container.ContainerControl as ContentPresenter;
if (containerControl != null)
{
((ISetLogicalParent)containerControl).SetParent(this);
containerControl.UpdateChild();
if (containerControl.Child != null)
{
LogicalChildren.Add(containerControl.Child);
}
}
}
else
{
LogicalChildren.Add(container.ContainerControl);
}
} }
} }
} }
@ -272,24 +254,7 @@ namespace Avalonia.Controls
// when it is removed from the Items collection. // when it is removed from the Items collection.
if (container?.ContainerControl != container?.Item) if (container?.ContainerControl != container?.Item)
{ {
if (ItemContainerGenerator.ContainerType == null) LogicalChildren.Remove(container.ContainerControl);
{
var containerControl = container.ContainerControl as ContentPresenter;
if (containerControl != null)
{
((ISetLogicalParent)containerControl).SetParent(null);
if (containerControl.Child != null)
{
LogicalChildren.Remove(containerControl.Child);
}
}
}
else
{
LogicalChildren.Remove(container.ContainerControl);
}
} }
} }
} }

46
tests/Avalonia.Controls.UnitTests/CarouselTests.cs
View File

@ -51,10 +51,9 @@ namespace Avalonia.Controls.UnitTests
Assert.Single(target.GetLogicalChildren()); Assert.Single(target.GetLogicalChildren());
var child = target.GetLogicalChildren().Single(); var child = GetContainerTextBlock(target.GetLogicalChildren().Single());
Assert.IsType<TextBlock>(child); Assert.Equal("Foo", child.Text);
Assert.Equal("Foo", ((TextBlock)child).Text);
} }
[Fact] [Fact]
@ -98,20 +97,18 @@ namespace Avalonia.Controls.UnitTests
Assert.Equal(3, target.GetLogicalChildren().Count()); Assert.Equal(3, target.GetLogicalChildren().Count());
var child = target.GetLogicalChildren().First(); var child = GetContainerTextBlock(target.GetLogicalChildren().First());
Assert.IsType<TextBlock>(child); Assert.Equal("Foo", child.Text);
Assert.Equal("Foo", ((TextBlock)child).Text);
var newItems = items.ToList(); var newItems = items.ToList();
newItems.RemoveAt(0); newItems.RemoveAt(0);
target.Items = newItems; target.Items = newItems;
child = target.GetLogicalChildren().First(); child = GetContainerTextBlock(target.GetLogicalChildren().First());
Assert.IsType<TextBlock>(child); Assert.Equal("Bar", child.Text);
Assert.Equal("Bar", ((TextBlock)child).Text);
} }
[Fact] [Fact]
@ -136,20 +133,18 @@ namespace Avalonia.Controls.UnitTests
Assert.Single(target.GetLogicalChildren()); Assert.Single(target.GetLogicalChildren());
var child = target.GetLogicalChildren().Single(); var child = GetContainerTextBlock(target.GetLogicalChildren().Single());
Assert.IsType<TextBlock>(child); Assert.Equal("Foo", child.Text);
Assert.Equal("Foo", ((TextBlock)child).Text);
var newItems = items.ToList(); var newItems = items.ToList();
newItems.RemoveAt(0); newItems.RemoveAt(0);
target.Items = newItems; target.Items = newItems;
child = target.GetLogicalChildren().Single(); child = GetContainerTextBlock(target.GetLogicalChildren().Single());
Assert.IsType<TextBlock>(child); Assert.Equal("Bar", child.Text);
Assert.Equal("Bar", ((TextBlock)child).Text);
} }
[Fact] [Fact]
@ -197,10 +192,9 @@ namespace Avalonia.Controls.UnitTests
Assert.Equal(3, target.GetLogicalChildren().Count()); Assert.Equal(3, target.GetLogicalChildren().Count());
var child = target.GetLogicalChildren().First(); var child = GetContainerTextBlock(target.GetLogicalChildren().First());
Assert.IsType<TextBlock>(child); Assert.Equal("Foo", child.Text);
Assert.Equal("Foo", ((TextBlock)child).Text);
target.Items = null; target.Items = null;
@ -233,7 +227,7 @@ namespace Avalonia.Controls.UnitTests
Assert.Equal("FooBar", target.SelectedItem); Assert.Equal("FooBar", target.SelectedItem);
var child = target.GetVisualDescendants().LastOrDefault(); var child = GetContainerTextBlock(target.GetVisualDescendants().LastOrDefault());
Assert.IsType<TextBlock>(child); Assert.IsType<TextBlock>(child);
Assert.Equal("FooBar", ((TextBlock)child).Text); Assert.Equal("FooBar", ((TextBlock)child).Text);
@ -261,14 +255,13 @@ namespace Avalonia.Controls.UnitTests
Assert.Equal(3, target.GetLogicalChildren().Count()); Assert.Equal(3, target.GetLogicalChildren().Count());
var child = target.GetLogicalChildren().First(); var child = GetContainerTextBlock(target.GetLogicalChildren().First());
Assert.IsType<TextBlock>(child); Assert.Equal("Foo", child.Text);
Assert.Equal("Foo", ((TextBlock)child).Text);
items.RemoveAt(0); items.RemoveAt(0);
child = target.GetLogicalChildren().First(); child = GetContainerTextBlock(target.GetLogicalChildren().First());
Assert.IsType<TextBlock>(child); Assert.IsType<TextBlock>(child);
Assert.Equal("Bar", ((TextBlock)child).Text); Assert.Equal("Bar", ((TextBlock)child).Text);
@ -314,5 +307,12 @@ namespace Avalonia.Controls.UnitTests
[~CarouselPresenter.PageTransitionProperty] = control[~Carousel.PageTransitionProperty], [~CarouselPresenter.PageTransitionProperty] = control[~Carousel.PageTransitionProperty],
}.RegisterInNameScope(scope); }.RegisterInNameScope(scope);
} }
private static TextBlock GetContainerTextBlock(object control)
{
var contentPresenter = Assert.IsType<ContentPresenter>(control);
contentPresenter.UpdateChild();
return Assert.IsType<TextBlock>(contentPresenter.Child);
}
} }
} }

32
tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
View File

@ -66,7 +66,7 @@ namespace Avalonia.Controls.UnitTests
} }
[Fact] [Fact]
public void Container_Child_Should_Have_LogicalParent_Set_To_Container() public void Container_Should_Have_LogicalParent_Set_To_ItemsControl()
{ {
using (UnitTestApplication.Start(TestServices.StyledWindow)) using (UnitTestApplication.Start(TestServices.StyledWindow))
{ {
@ -87,7 +87,7 @@ namespace Avalonia.Controls.UnitTests
var container = (ContentPresenter)target.Presenter.Panel.Children[0]; var container = (ContentPresenter)target.Presenter.Panel.Children[0];
Assert.Equal(container, container.Child.Parent); Assert.Equal(target, container.Parent);
} }
} }
@ -190,7 +190,7 @@ namespace Avalonia.Controls.UnitTests
} }
[Fact] [Fact]
public void Adding_String_Item_Should_Make_TextBlock_Appear_In_LogicalChildren() public void Adding_String_Item_Should_Make_ContentPresenter_Appear_In_LogicalChildren()
{ {
var target = new ItemsControl(); var target = new ItemsControl();
var child = new Control(); var child = new Control();
@ -202,7 +202,7 @@ namespace Avalonia.Controls.UnitTests
var logical = (ILogical)target; var logical = (ILogical)target;
Assert.Equal(1, logical.LogicalChildren.Count); Assert.Equal(1, logical.LogicalChildren.Count);
Assert.IsType<TextBlock>(logical.LogicalChildren[0]); Assert.IsType<ContentPresenter>(logical.LogicalChildren[0]);
} }
[Fact] [Fact]
@ -575,6 +575,30 @@ namespace Avalonia.Controls.UnitTests
}; };
} }
[Fact]
public void Detaching_Then_Reattaching_To_Logical_Tree_Twice_Does_Not_Throw()
{
// # Issue 3487
var target = new ItemsControl
{
Template = GetTemplate(),
Items = new[] { "foo", "bar" },
ItemTemplate = new FuncDataTemplate<string>((_, __) => new Canvas()),
};
var root = new TestRoot(target);
root.Measure(Size.Infinity);
root.Arrange(new Rect(root.DesiredSize));
root.Child = null;
root.Child = target;
target.Measure(Size.Infinity);
root.Child = null;
root.Child = target;
}
private class Item private class Item
{ {
public Item(string value) public Item(string value)

Write Preview
Loading…
Cancel
Save