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

Make DropDown have correct logical children.

pull/39/head
Steven Kirk 11 years ago
parent
f013760ce5
commit
7f1c3e760e
3 changed files with 29 additions and 214 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      Perspex.Controls/DropDown.cs
  2. 11
      Perspex.Themes.Default/DropDownStyle.cs
  3. 219
      Tests/Perspex.Controls.UnitTests/DropDownTests.cs

13
Perspex.Controls/DropDown.cs
View File

@ -66,16 +66,9 @@ namespace Perspex.Controls
protected override void OnTemplateApplied()
{
var presenter = this.FindTemplateChild<ContentPresenter>("contentPresenter");
if (presenter != null)
{
this.logicalChildren.Source = ((ILogical)presenter).LogicalChildren;
}
else
{
this.logicalChildren.Source = null;
}
var container = this.GetTemplateChild<Panel>("container");
((IItemsPanel)container).ChildLogicalParent = this;
this.logicalChildren.Source = ((ILogical)container).LogicalChildren;
}
private void SetContentParent(Tuple<object, object> change)

11
Perspex.Themes.Default/DropDownStyle.cs
View File

@ -45,6 +45,7 @@ namespace Perspex.Themes.Default
[~Border.BorderThicknessProperty] = control[~DropDown.BorderThicknessProperty],
Content = new Grid
{
Id = "container",
ColumnDefinitions = new ColumnDefinitions
{
new ColumnDefinition(new GridLength(1, GridUnitType.Star)),
@ -52,13 +53,13 @@ namespace Perspex.Themes.Default
},
Children = new Controls
{
new ContentPresenter
new ContentControl
{
Id = "contentPresenter",
Id = "contentControl",
Margin = new Thickness(3),
[~ContentPresenter.ContentProperty] = control[~DropDown.ContentProperty],
[~ContentPresenter.HorizontalAlignmentProperty] = control[~DropDown.HorizontalContentAlignmentProperty],
[~ContentPresenter.VerticalAlignmentProperty] = control[~DropDown.VerticalContentAlignmentProperty],
[~ContentControl.ContentProperty] = control[~DropDown.ContentProperty],
[~ContentControl.HorizontalAlignmentProperty] = control[~DropDown.HorizontalContentAlignmentProperty],
[~ContentControl.VerticalAlignmentProperty] = control[~DropDown.VerticalContentAlignmentProperty],
},
new ToggleButton
{

219
Tests/Perspex.Controls.UnitTests/DropDownTests.cs
View File

@ -12,6 +12,7 @@ namespace Perspex.Controls.UnitTests
using Moq;
using Perspex.Controls;
using Perspex.Controls.Presenters;
using Perspex.Controls.Primitives;
using Perspex.Controls.Templates;
using Perspex.Platform;
using Perspex.Styling;
@ -24,220 +25,40 @@ namespace Perspex.Controls.UnitTests
public class DropDownTests
{
[Fact]
public void Template_Should_Be_Instantiated()
{
using (var ctx = this.RegisterServices())
{
var target = new DropDown();
target.Content = "Foo";
target.Template = this.GetTemplate();
target.Measure(new Size(100, 100));
var child = ((IVisual)target).VisualChildren.Single();
Assert.IsType<Border>(child);
child = child.VisualChildren.Single();
Assert.IsType<ContentPresenter>(child);
child = child.VisualChildren.Single();
Assert.IsType<TextBlock>(child);
}
}
[Fact]
public void Templated_Children_Should_Be_Styled()
{
using (var ctx = this.RegisterServices())
{
var root = new TestRoot();
var target = new DropDown();
var styler = new Mock<IStyler>();
Locator.CurrentMutable.Register(() => styler.Object, typeof(IStyler));
target.Content = "Foo";
target.Template = this.GetTemplate();
root.Content = target;
target.ApplyTemplate();
styler.Verify(x => x.ApplyStyles(It.IsAny<DropDown>()), Times.Once());
styler.Verify(x => x.ApplyStyles(It.IsAny<Border>()), Times.Once());
styler.Verify(x => x.ApplyStyles(It.IsAny<ContentPresenter>()), Times.Once());
styler.Verify(x => x.ApplyStyles(It.IsAny<TextBlock>()), Times.Once());
}
}
[Fact]
public void ContentPresenter_Should_Have_TemplatedParent_Set()
{
var target = new DropDown();
var child = new Border();
target.Template = this.GetTemplate();
target.Content = child;
target.ApplyTemplate();
var contentPresenter = child.GetVisualParent<ContentPresenter>();
Assert.Equal(target, contentPresenter.TemplatedParent);
}
[Fact]
public void Content_Should_Have_TemplatedParent_Set_To_Null()
{
var target = new DropDown();
var child = new Border();
target.Template = this.GetTemplate();
target.Content = child;
target.ApplyTemplate();
Assert.Null(child.TemplatedParent);
}
[Fact]
public void Setting_Content_Should_Set_Child_Controls_Parent()
{
var target = new DropDown();
var child = new Control();
target.Content = child;
Assert.Equal(child.Parent, target);
Assert.Equal(((ILogical)child).LogicalParent, target);
}
[Fact]
public void Clearing_Content_Should_Clear_Child_Controls_Parent()
{
var target = new DropDown();
var child = new Control();
target.Content = child;
target.Content = null;
Assert.Null(child.Parent);
Assert.Null(((ILogical)child).LogicalParent);
}
[Fact]
public void Setting_Content_To_Control_Should_Make_Control_Appear_In_LogicalChildren()
{
var target = new DropDown();
var child = new Control();
target.Template = this.GetTemplate();
target.Content = child;
target.ApplyTemplate();
Assert.Equal(new[] { child }, ((ILogical)target).LogicalChildren.ToList());
}
[Fact]
public void Setting_Content_To_String_Should_Make_TextBlock_Appear_In_LogicalChildren()
public void Logical_Children_Should_Be_Children_Of_Container()
{
var target = new DropDown();
var child = new Control();
target.Template = this.GetTemplate();
target.Content = "Foo";
target.ApplyTemplate();
var logical = (ILogical)target;
Assert.Equal(1, logical.LogicalChildren.Count);
Assert.IsType<TextBlock>(logical.LogicalChildren[0]);
}
[Fact]
public void Clearing_Content_Should_Remove_From_LogicalChildren()
{
var target = new DropDown();
var child = new Control();
target.Content = child;
target.Content = null;
target.ApplyTemplate();
Assert.Equal(new ILogical[0], ((ILogical)target).LogicalChildren.ToList());
}
[Fact]
public void Setting_Content_Should_Fire_LogicalChildren_CollectionChanged()
{
var target = new DropDown();
var child = new Control();
var called = false;
((ILogical)target).LogicalChildren.CollectionChanged += (s, e) =>
called = e.Action == NotifyCollectionChangedAction.Add;
target.Template = this.GetTemplate();
target.Content = child;
target.ApplyTemplate();
// Need to call ApplyTemplate on presenter for CollectionChanged to be called.
var presenter = target.GetTemplateChildren().Single(x => x.Id == "contentPresenter");
presenter.ApplyTemplate();
Assert.True(called);
}
[Fact]
public void Clearing_Content_Should_Fire_LogicalChildren_CollectionChanged()
{
var target = new DropDown();
var child = new Control();
var called = false;
target.Template = this.GetTemplate();
target.Content = child;
target.ApplyTemplate();
((ILogical)target).LogicalChildren.CollectionChanged += (s, e) =>
called = e.Action == NotifyCollectionChangedAction.Remove;
target.Content = null;
// Need to call ApplyTemplate on presenter for CollectionChanged to be called.
var presenter = target.GetTemplateChildren().Single(x => x.Id == "contentPresenter");
presenter.ApplyTemplate();
Assert.True(called);
}
[Fact]
public void Changing_Content_Should_Fire_LogicalChildren_CollectionChanged()
{
var target = new DropDown();
var child1 = new Control();
var child2 = new Control();
var called = false;
target.Template = this.GetTemplate();
target.Content = child1;
target.ApplyTemplate();
((ILogical)target).LogicalChildren.CollectionChanged += (s, e) =>
called = e.Action == NotifyCollectionChangedAction.Replace;
target.Content = child2;
// Need to call ApplyTemplate on presenter for CollectionChanged to be called.
var presenter = target.GetTemplateChildren().Single(x => x.Id == "contentPresenter");
presenter.ApplyTemplate();
var childIds = ((ILogical)target).LogicalChildren.Cast<Control>().Select(x => x.Id);
Assert.True(called);
Assert.Equal(new[] { "contentControl", "toggle", "popup" }, childIds);
}
private ControlTemplate GetTemplate()
{
return ControlTemplate.Create<DropDown>(parent =>
{
return new Border
return new Panel
{
Background = new Perspex.Media.SolidColorBrush(0xffffffff),
Content = new ContentPresenter
Id = "container",
Children = new Controls
{
Id = "contentPresenter",
[~ContentPresenter.ContentProperty] = parent[~DropDown.ContentProperty],
new ContentControl
{
Id = "contentControl",
[~ContentPresenter.ContentProperty] = parent[~DropDown.ContentProperty],
},
new ToggleButton
{
Id = "toggle",
},
new Popup
{
Id = "popup",
}
}
};
});

Write Preview
Loading…
Cancel
Save