From fba2633ab915fbd773687ad390226b0bca42245e Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 24 Jul 2015 18:59:37 +0200 Subject: [PATCH] Renamed Decorator.Content property as Child. --- Perspex.Controls/Border.cs | 4 +- Perspex.Controls/Decorator.cs | 16 +++--- Perspex.Diagnostics/DevTools.cs | 2 +- Perspex.Themes.Default/ButtonStyle.cs | 2 +- Perspex.Themes.Default/CheckBoxStyle.cs | 2 +- Perspex.Themes.Default/DropDownStyle.cs | 2 +- Perspex.Themes.Default/ListBoxItemStyle.cs | 2 +- Perspex.Themes.Default/ListBoxStyle.cs | 2 +- Perspex.Themes.Default/MenuItemStyle.cs | 8 +-- Perspex.Themes.Default/MenuStyle.cs | 2 +- Perspex.Themes.Default/PopupRootStyle.cs | 2 +- Perspex.Themes.Default/RadioButtonStyle.cs | 2 +- Perspex.Themes.Default/ScrollBarStyle.cs | 2 +- Perspex.Themes.Default/TextBoxStyle.cs | 2 +- Perspex.Themes.Default/ToggleButtonStyle.cs | 2 +- Perspex.Themes.Default/ToolTipStyle.cs | 2 +- Perspex.Themes.Default/TreeViewItemStyle.cs | 4 +- Perspex.Themes.Default/TreeViewStyle.cs | 2 +- Perspex.Themes.Default/WindowStyle.cs | 4 +- TestApplication/Program.cs | 4 +- .../Perspex.Controls.UnitTests/BorderTests.cs | 22 ++++---- .../ContentControlTests.cs | 4 +- .../ControlTests.cs | 8 +-- .../DecoratorTests.cs | 22 ++++---- .../ItemsControlTests.cs | 2 +- .../TemplatedControlTests.cs | 4 +- .../Templates/TemplateExtensionsTests.cs | 6 +-- .../FullLayoutTests.cs | 4 +- .../Controls/BorderTests.cs | 54 +++++++++---------- .../Controls/ImageTests.cs | 16 +++--- .../Shapes/EllipseTests.cs | 2 +- Tests/Perspex.RenderTests/Shapes/PathTests.cs | 10 ++-- .../Shapes/RectangleTests.cs | 6 +-- .../VisualTree/BoundsTrackerTests.cs | 4 +- .../SelectorTests_Template.cs | 2 +- 35 files changed, 117 insertions(+), 117 deletions(-) diff --git a/Perspex.Controls/Border.cs b/Perspex.Controls/Border.cs index 7a8836c6c4..c46017b111 100644 --- a/Perspex.Controls/Border.cs +++ b/Perspex.Controls/Border.cs @@ -76,7 +76,7 @@ namespace Perspex.Controls protected override Size ArrangeOverride(Size finalSize) { - Control content = this.Content; + Control content = this.Child; if (content != null) { @@ -89,7 +89,7 @@ namespace Perspex.Controls protected override Size MeasureOverride(Size availableSize) { - var content = this.Content; + var content = this.Child; var padding = this.Padding + new Thickness(this.BorderThickness); if (content != null) diff --git a/Perspex.Controls/Decorator.cs b/Perspex.Controls/Decorator.cs index e69bbb66f8..c83ffbf091 100644 --- a/Perspex.Controls/Decorator.cs +++ b/Perspex.Controls/Decorator.cs @@ -15,8 +15,8 @@ namespace Perspex.Controls public class Decorator : Control, IVisual, ILogical { - public static readonly PerspexProperty ContentProperty = - PerspexProperty.Register("Content"); + public static readonly PerspexProperty ChildProperty = + PerspexProperty.Register("Child"); public static readonly PerspexProperty PaddingProperty = PerspexProperty.Register("Padding"); @@ -25,7 +25,7 @@ namespace Perspex.Controls public Decorator() { - this.GetObservableWithHistory(ContentProperty).Subscribe(x => + this.GetObservableWithHistory(ChildProperty).Subscribe(x => { if (x.Item1 != null) { @@ -43,10 +43,10 @@ namespace Perspex.Controls }); } - public Control Content + public Control Child { - get { return this.GetValue(ContentProperty); } - set { this.SetValue(ContentProperty, value); } + get { return this.GetValue(ChildProperty); } + set { this.SetValue(ChildProperty, value); } } public Thickness Padding @@ -62,7 +62,7 @@ namespace Perspex.Controls protected override Size ArrangeOverride(Size finalSize) { - Control content = this.Content; + Control content = this.Child; if (content != null) { @@ -74,7 +74,7 @@ namespace Perspex.Controls protected override Size MeasureOverride(Size availableSize) { - var content = this.Content; + var content = this.Child; var padding = this.Padding; if (content != null) diff --git a/Perspex.Diagnostics/DevTools.cs b/Perspex.Diagnostics/DevTools.cs index 54391d2de2..64681a04ef 100644 --- a/Perspex.Diagnostics/DevTools.cs +++ b/Perspex.Diagnostics/DevTools.cs @@ -64,7 +64,7 @@ namespace Perspex.Diagnostics { this.DataTemplates.Add(new ViewLocator()); - this.Content = new Grid + this.Child = new Grid { RowDefinitions = new RowDefinitions("*,Auto"), Children = new Controls diff --git a/Perspex.Themes.Default/ButtonStyle.cs b/Perspex.Themes.Default/ButtonStyle.cs index e711c977e7..2fcc277a25 100644 --- a/Perspex.Themes.Default/ButtonStyle.cs +++ b/Perspex.Themes.Default/ButtonStyle.cs @@ -90,7 +90,7 @@ namespace Perspex.Themes.Default { Name = "border", Padding = new Thickness(3), - Content = new ContentPresenter + Child = new ContentPresenter { Name = "contentPresenter", [~ContentPresenter.ContentProperty] = control[~Button.ContentProperty], diff --git a/Perspex.Themes.Default/CheckBoxStyle.cs b/Perspex.Themes.Default/CheckBoxStyle.cs index 827664e53a..dc40e3c1b9 100644 --- a/Perspex.Themes.Default/CheckBoxStyle.cs +++ b/Perspex.Themes.Default/CheckBoxStyle.cs @@ -50,7 +50,7 @@ namespace Perspex.Themes.Default Border result = new Border { [~Border.BackgroundProperty] = control[~CheckBox.BackgroundProperty], - Content = new Grid + Child = new Grid { ColumnDefinitions = new ColumnDefinitions { diff --git a/Perspex.Themes.Default/DropDownStyle.cs b/Perspex.Themes.Default/DropDownStyle.cs index 3ea74713f7..04dcdaada6 100644 --- a/Perspex.Themes.Default/DropDownStyle.cs +++ b/Perspex.Themes.Default/DropDownStyle.cs @@ -50,7 +50,7 @@ namespace Perspex.Themes.Default [~Border.BackgroundProperty] = control[~DropDown.BackgroundProperty], [~Border.BorderBrushProperty] = control[~DropDown.BorderBrushProperty], [~Border.BorderThicknessProperty] = control[~DropDown.BorderThicknessProperty], - Content = new Grid + Child = new Grid { Name = "container", ColumnDefinitions = new ColumnDefinitions diff --git a/Perspex.Themes.Default/ListBoxItemStyle.cs b/Perspex.Themes.Default/ListBoxItemStyle.cs index eebb533b5c..0553dc6886 100644 --- a/Perspex.Themes.Default/ListBoxItemStyle.cs +++ b/Perspex.Themes.Default/ListBoxItemStyle.cs @@ -44,7 +44,7 @@ namespace Perspex.Themes.Default [~Border.BackgroundProperty] = control[~ListBoxItem.BackgroundProperty], [~Border.BorderBrushProperty] = control[~ListBoxItem.BorderBrushProperty], [~Border.BorderThicknessProperty] = control[~ListBoxItem.BorderThicknessProperty], - Content = new ContentPresenter + Child = new ContentPresenter { [~ContentPresenter.ContentProperty] = control[~ListBoxItem.ContentProperty], }, diff --git a/Perspex.Themes.Default/ListBoxStyle.cs b/Perspex.Themes.Default/ListBoxStyle.cs index d6e35ecb20..e2316c726f 100644 --- a/Perspex.Themes.Default/ListBoxStyle.cs +++ b/Perspex.Themes.Default/ListBoxStyle.cs @@ -38,7 +38,7 @@ namespace Perspex.Themes.Default [~Border.BackgroundProperty] = control[~ListBox.BackgroundProperty], [~Border.BorderBrushProperty] = control[~ListBox.BorderBrushProperty], [~Border.BorderThicknessProperty] = control[~ListBox.BorderThicknessProperty], - Content = new ScrollViewer + Child = new ScrollViewer { Content = new ItemsPresenter { diff --git a/Perspex.Themes.Default/MenuItemStyle.cs b/Perspex.Themes.Default/MenuItemStyle.cs index 16cbb1688e..45b975b7a3 100644 --- a/Perspex.Themes.Default/MenuItemStyle.cs +++ b/Perspex.Themes.Default/MenuItemStyle.cs @@ -77,7 +77,7 @@ namespace Perspex.Themes.Default [~Border.BackgroundProperty] = control[~MenuItem.BackgroundProperty], [~Border.BorderBrushProperty] = control[~MenuItem.BorderBrushProperty], [~Border.BorderThicknessProperty] = control[~MenuItem.BorderThicknessProperty], - Content = new Panel + Child = new Panel { Children = new Controls { @@ -102,7 +102,7 @@ namespace Perspex.Themes.Default BorderBrush = new SolidColorBrush(0xff999999), BorderThickness = 1, Padding = new Thickness(2), - Content = new ScrollViewer + Child = new ScrollViewer { Content = new Panel { @@ -148,7 +148,7 @@ namespace Perspex.Themes.Default [~Border.BackgroundProperty] = control[~MenuItem.BackgroundProperty], [~Border.BorderBrushProperty] = control[~MenuItem.BorderBrushProperty], [~Border.BorderThicknessProperty] = control[~MenuItem.BorderThicknessProperty], - Content = new Grid + Child = new Grid { ColumnDefinitions = new ColumnDefinitions { @@ -210,7 +210,7 @@ namespace Perspex.Themes.Default BorderBrush = new SolidColorBrush(0xff999999), BorderThickness = 1, Padding = new Thickness(2), - Content = new ScrollViewer + Child = new ScrollViewer { Content = new Panel { diff --git a/Perspex.Themes.Default/MenuStyle.cs b/Perspex.Themes.Default/MenuStyle.cs index 4761751a1b..e4bbf76536 100644 --- a/Perspex.Themes.Default/MenuStyle.cs +++ b/Perspex.Themes.Default/MenuStyle.cs @@ -36,7 +36,7 @@ namespace Perspex.Themes.Default [~Border.BorderBrushProperty] = control[~Menu.BorderBrushProperty], [~Border.BorderThicknessProperty] = control[~Menu.BorderThicknessProperty], [~Border.PaddingProperty] = control[~Menu.PaddingProperty], - Content = new ItemsPresenter + Child = new ItemsPresenter { Name = "itemsPresenter", [~ItemsPresenter.ItemsProperty] = control[~Menu.ItemsProperty], diff --git a/Perspex.Themes.Default/PopupRootStyle.cs b/Perspex.Themes.Default/PopupRootStyle.cs index c41be5197c..cfffc2221c 100644 --- a/Perspex.Themes.Default/PopupRootStyle.cs +++ b/Perspex.Themes.Default/PopupRootStyle.cs @@ -35,7 +35,7 @@ namespace Perspex.Themes.Default return new Border { [~Border.BackgroundProperty] = control[~PopupRoot.BackgroundProperty], - Content = new ContentPresenter + Child = new ContentPresenter { Name = "contentPresenter", [~ContentPresenter.ContentProperty] = control[~PopupRoot.ContentProperty], diff --git a/Perspex.Themes.Default/RadioButtonStyle.cs b/Perspex.Themes.Default/RadioButtonStyle.cs index 02026e987a..7e8e16b30f 100644 --- a/Perspex.Themes.Default/RadioButtonStyle.cs +++ b/Perspex.Themes.Default/RadioButtonStyle.cs @@ -50,7 +50,7 @@ namespace Perspex.Themes.Default Border result = new Border { [~Border.BackgroundProperty] = control[~RadioButton.BackgroundProperty], - Content = new Grid + Child = new Grid { ColumnDefinitions = new ColumnDefinitions { diff --git a/Perspex.Themes.Default/ScrollBarStyle.cs b/Perspex.Themes.Default/ScrollBarStyle.cs index ba926ed95f..dab3613c94 100644 --- a/Perspex.Themes.Default/ScrollBarStyle.cs +++ b/Perspex.Themes.Default/ScrollBarStyle.cs @@ -64,7 +64,7 @@ namespace Perspex.Themes.Default return new Border { Background = Brushes.Silver, - Content = new Track + Child = new Track { Name = "track", [~Track.MinimumProperty] = control[~ScrollBar.MinimumProperty], diff --git a/Perspex.Themes.Default/TextBoxStyle.cs b/Perspex.Themes.Default/TextBoxStyle.cs index 8220afb0bc..15a574b1e4 100644 --- a/Perspex.Themes.Default/TextBoxStyle.cs +++ b/Perspex.Themes.Default/TextBoxStyle.cs @@ -49,7 +49,7 @@ namespace Perspex.Themes.Default [~Border.BackgroundProperty] = control[~TextBox.BackgroundProperty], [~Border.BorderBrushProperty] = control[~TextBox.BorderBrushProperty], [~Border.BorderThicknessProperty] = control[~TextBox.BorderThicknessProperty], - Content = new ScrollViewer + Child = new ScrollViewer { [~ScrollViewer.CanScrollHorizontallyProperty] = control[~ScrollViewer.CanScrollHorizontallyProperty], [~ScrollViewer.HorizontalScrollBarVisibilityProperty] = control[~ScrollViewer.HorizontalScrollBarVisibilityProperty], diff --git a/Perspex.Themes.Default/ToggleButtonStyle.cs b/Perspex.Themes.Default/ToggleButtonStyle.cs index cb43807202..7b944c4515 100644 --- a/Perspex.Themes.Default/ToggleButtonStyle.cs +++ b/Perspex.Themes.Default/ToggleButtonStyle.cs @@ -89,7 +89,7 @@ namespace Perspex.Themes.Default [~Border.BackgroundProperty] = control[~ToggleButton.BackgroundProperty], [~Border.BorderBrushProperty] = control[~ToggleButton.BorderBrushProperty], [~Border.BorderThicknessProperty] = control[~ToggleButton.BorderThicknessProperty], - Content = new ContentPresenter + Child = new ContentPresenter { Name = "contentPresenter", [~ContentPresenter.ContentProperty] = control[~ToggleButton.ContentProperty], diff --git a/Perspex.Themes.Default/ToolTipStyle.cs b/Perspex.Themes.Default/ToolTipStyle.cs index bc27fdd72c..abb2043bad 100644 --- a/Perspex.Themes.Default/ToolTipStyle.cs +++ b/Perspex.Themes.Default/ToolTipStyle.cs @@ -40,7 +40,7 @@ namespace Perspex.Themes.Default [~Border.BorderBrushProperty] = control[~ToolTip.BorderBrushProperty], [~Border.BorderThicknessProperty] = control[~ToolTip.BorderThicknessProperty], [~Border.PaddingProperty] = control[~ToolTip.PaddingProperty], - Content = new ContentPresenter + Child = new ContentPresenter { Name = "contentPresenter", [~ContentPresenter.ContentProperty] = control[~ToolTip.ContentProperty], diff --git a/Perspex.Themes.Default/TreeViewItemStyle.cs b/Perspex.Themes.Default/TreeViewItemStyle.cs index 2b952480f9..77cf318ef7 100644 --- a/Perspex.Themes.Default/TreeViewItemStyle.cs +++ b/Perspex.Themes.Default/TreeViewItemStyle.cs @@ -92,7 +92,7 @@ namespace Perspex.Themes.Default Name = "header", [~Border.BackgroundProperty] = control[~TreeViewItem.BackgroundProperty], [Grid.ColumnProperty] = 1, - Content = new ContentPresenter + Child = new ContentPresenter { [~ContentPresenter.ContentProperty] = control[~TreeViewItem.HeaderProperty], }, @@ -119,7 +119,7 @@ namespace Perspex.Themes.Default Height = 14, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, - Content = new Path + Child = new Path { Fill = Brushes.Black, HorizontalAlignment = HorizontalAlignment.Center, diff --git a/Perspex.Themes.Default/TreeViewStyle.cs b/Perspex.Themes.Default/TreeViewStyle.cs index 5283effd59..700aec404b 100644 --- a/Perspex.Themes.Default/TreeViewStyle.cs +++ b/Perspex.Themes.Default/TreeViewStyle.cs @@ -38,7 +38,7 @@ namespace Perspex.Themes.Default [~Border.BackgroundProperty] = control[~TreeView.BackgroundProperty], [~Border.BorderBrushProperty] = control[~TreeView.BorderBrushProperty], [~Border.BorderThicknessProperty] = control[~TreeView.BorderThicknessProperty], - Content = new ScrollViewer + Child = new ScrollViewer { CanScrollHorizontally = true, Content = new ItemsPresenter diff --git a/Perspex.Themes.Default/WindowStyle.cs b/Perspex.Themes.Default/WindowStyle.cs index 45c3cce639..f427ee02cd 100644 --- a/Perspex.Themes.Default/WindowStyle.cs +++ b/Perspex.Themes.Default/WindowStyle.cs @@ -36,9 +36,9 @@ namespace Perspex.Themes.Default return new Border { [~Border.BackgroundProperty] = control[~Window.BackgroundProperty], - Content = new AdornerDecorator + Child = new AdornerDecorator { - Content = new ContentPresenter + Child = new ContentPresenter { Name = "contentPresenter", [~ContentPresenter.ContentProperty] = control[~Window.ContentProperty], diff --git a/TestApplication/Program.cs b/TestApplication/Program.cs index ed297345b0..e9310eda59 100644 --- a/TestApplication/Program.cs +++ b/TestApplication/Program.cs @@ -580,7 +580,7 @@ namespace TestApplication VerticalAlignment = VerticalAlignment.Center, Background = Brushes.Crimson, RenderTransform = new RotateTransform(), - Content = new TextBox + Child = new TextBox { Background = Brushes.White, Text = "Hello!", @@ -595,7 +595,7 @@ namespace TestApplication HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, Background = Brushes.Coral, - Content = new Image + Child = new Image { Source = new Bitmap("github_icon.png"), HorizontalAlignment = HorizontalAlignment.Center, diff --git a/Tests/Perspex.Controls.UnitTests/BorderTests.cs b/Tests/Perspex.Controls.UnitTests/BorderTests.cs index 4629786467..fc0e89354c 100644 --- a/Tests/Perspex.Controls.UnitTests/BorderTests.cs +++ b/Tests/Perspex.Controls.UnitTests/BorderTests.cs @@ -18,7 +18,7 @@ namespace Perspex.Controls.UnitTests var target = new Border(); var child = new Control(); - target.Content = child; + target.Child = child; Assert.Equal(child.Parent, target); Assert.Equal(((ILogical)child).LogicalParent, target); @@ -30,8 +30,8 @@ namespace Perspex.Controls.UnitTests var target = new Border(); var child = new Control(); - target.Content = child; - target.Content = null; + target.Child = child; + target.Child = null; Assert.Null(child.Parent); Assert.Null(((ILogical)child).LogicalParent); @@ -43,7 +43,7 @@ namespace Perspex.Controls.UnitTests var target = new Border(); var child = new Control(); - target.Content = child; + target.Child = child; Assert.Equal(new[] { child }, ((ILogical)target).LogicalChildren.ToList()); } @@ -54,8 +54,8 @@ namespace Perspex.Controls.UnitTests var target = new Border(); var child = new Control(); - target.Content = child; - target.Content = null; + target.Child = child; + target.Child = null; Assert.Equal(new ILogical[0], ((ILogical)target).LogicalChildren.ToList()); } @@ -70,7 +70,7 @@ namespace Perspex.Controls.UnitTests ((ILogical)target).LogicalChildren.CollectionChanged += (s, e) => called = e.Action == NotifyCollectionChangedAction.Add; - target.Content = child; + target.Child = child; Assert.True(called); } @@ -82,12 +82,12 @@ namespace Perspex.Controls.UnitTests var child = new Control(); var called = false; - target.Content = child; + target.Child = child; ((ILogical)target).LogicalChildren.CollectionChanged += (s, e) => called = e.Action == NotifyCollectionChangedAction.Remove; - target.Content = null; + target.Child = null; Assert.True(called); } @@ -100,12 +100,12 @@ namespace Perspex.Controls.UnitTests var child2 = new Control(); var called = false; - target.Content = child1; + target.Child = child1; ((ILogical)target).LogicalChildren.CollectionChanged += (s, e) => called = e.Action == NotifyCollectionChangedAction.Replace; - target.Content = child2; + target.Child = child2; Assert.True(called); } diff --git a/Tests/Perspex.Controls.UnitTests/ContentControlTests.cs b/Tests/Perspex.Controls.UnitTests/ContentControlTests.cs index e02c2f21e6..e044f426ce 100644 --- a/Tests/Perspex.Controls.UnitTests/ContentControlTests.cs +++ b/Tests/Perspex.Controls.UnitTests/ContentControlTests.cs @@ -56,7 +56,7 @@ namespace Perspex.Controls.UnitTests Locator.CurrentMutable.Register(() => styler.Object, typeof(IStyler)); target.Content = "Foo"; target.Template = this.GetTemplate(); - root.Content = target; + root.Child = target; target.ApplyTemplate(); @@ -278,7 +278,7 @@ namespace Perspex.Controls.UnitTests return new Border { Background = new Perspex.Media.SolidColorBrush(0xffffffff), - Content = new ContentPresenter + Child = new ContentPresenter { Name = "contentPresenter", [~ContentPresenter.ContentProperty] = parent[~ContentControl.ContentProperty], diff --git a/Tests/Perspex.Controls.UnitTests/ControlTests.cs b/Tests/Perspex.Controls.UnitTests/ControlTests.cs index 0372f38637..04776e0bed 100644 --- a/Tests/Perspex.Controls.UnitTests/ControlTests.cs +++ b/Tests/Perspex.Controls.UnitTests/ControlTests.cs @@ -37,7 +37,7 @@ namespace Perspex.Controls.UnitTests Locator.CurrentMutable.Register(() => styler.Object, typeof(IStyler)); - root.Content = target; + root.Child = target; styler.Verify(x => x.ApplyStyles(target), Times.Once()); } @@ -56,12 +56,12 @@ namespace Perspex.Controls.UnitTests Locator.CurrentMutable.Register(() => styler.Object, typeof(IStyler)); - parent.Content = child; - child.Content = grandchild; + parent.Child = child; + child.Child = grandchild; styler.Verify(x => x.ApplyStyles(It.IsAny()), Times.Never()); - root.Content = parent; + root.Child = parent; styler.Verify(x => x.ApplyStyles(parent), Times.Once()); styler.Verify(x => x.ApplyStyles(child), Times.Once()); diff --git a/Tests/Perspex.Controls.UnitTests/DecoratorTests.cs b/Tests/Perspex.Controls.UnitTests/DecoratorTests.cs index 25b2d9bea7..7ba6b713aa 100644 --- a/Tests/Perspex.Controls.UnitTests/DecoratorTests.cs +++ b/Tests/Perspex.Controls.UnitTests/DecoratorTests.cs @@ -18,7 +18,7 @@ namespace Perspex.Controls.UnitTests var decorator = new Decorator(); var child = new Control(); - decorator.Content = child; + decorator.Child = child; Assert.Equal(child.Parent, decorator); Assert.Equal(((ILogical)child).LogicalParent, decorator); @@ -30,8 +30,8 @@ namespace Perspex.Controls.UnitTests var decorator = new Decorator(); var child = new Control(); - decorator.Content = child; - decorator.Content = null; + decorator.Child = child; + decorator.Child = null; Assert.Null(child.Parent); Assert.Null(((ILogical)child).LogicalParent); @@ -43,7 +43,7 @@ namespace Perspex.Controls.UnitTests var decorator = new Decorator(); var child = new Control(); - decorator.Content = child; + decorator.Child = child; Assert.Equal(new[] { child }, ((ILogical)decorator).LogicalChildren.ToList()); } @@ -54,8 +54,8 @@ namespace Perspex.Controls.UnitTests var decorator = new Decorator(); var child = new Control(); - decorator.Content = child; - decorator.Content = null; + decorator.Child = child; + decorator.Child = null; Assert.Equal(new ILogical[0], ((ILogical)decorator).LogicalChildren.ToList()); } @@ -70,7 +70,7 @@ namespace Perspex.Controls.UnitTests ((ILogical)decorator).LogicalChildren.CollectionChanged += (s, e) => called = e.Action == NotifyCollectionChangedAction.Add; - decorator.Content = child; + decorator.Child = child; Assert.True(called); } @@ -82,12 +82,12 @@ namespace Perspex.Controls.UnitTests var child = new Control(); var called = false; - decorator.Content = child; + decorator.Child = child; ((ILogical)decorator).LogicalChildren.CollectionChanged += (s, e) => called = e.Action == NotifyCollectionChangedAction.Remove; - decorator.Content = null; + decorator.Child = null; Assert.True(called); } @@ -100,12 +100,12 @@ namespace Perspex.Controls.UnitTests var child2 = new Control(); var called = false; - decorator.Content = child1; + decorator.Child = child1; ((ILogical)decorator).LogicalChildren.CollectionChanged += (s, e) => called = e.Action == NotifyCollectionChangedAction.Replace; - decorator.Content = child2; + decorator.Child = child2; Assert.True(called); } diff --git a/Tests/Perspex.Controls.UnitTests/ItemsControlTests.cs b/Tests/Perspex.Controls.UnitTests/ItemsControlTests.cs index 919533b255..922e0cfa3e 100644 --- a/Tests/Perspex.Controls.UnitTests/ItemsControlTests.cs +++ b/Tests/Perspex.Controls.UnitTests/ItemsControlTests.cs @@ -298,7 +298,7 @@ namespace Perspex.Controls.UnitTests return new Border { Background = new Perspex.Media.SolidColorBrush(0xffffffff), - Content = new ItemsPresenter + Child = new ItemsPresenter { Name = "itemsPresenter", [~ItemsPresenter.ItemsProperty] = parent[~ItemsControl.ItemsProperty], diff --git a/Tests/Perspex.Controls.UnitTests/TemplatedControlTests.cs b/Tests/Perspex.Controls.UnitTests/TemplatedControlTests.cs index 3348ac77da..b86af21db0 100644 --- a/Tests/Perspex.Controls.UnitTests/TemplatedControlTests.cs +++ b/Tests/Perspex.Controls.UnitTests/TemplatedControlTests.cs @@ -155,7 +155,7 @@ namespace Perspex.Controls.UnitTests var root = new TestRoot { - Content = (target = new TestTemplatedControl + Child = (target = new TestTemplatedControl { Template = new ControlTemplate(_ => { @@ -247,7 +247,7 @@ namespace Perspex.Controls.UnitTests { return new Border { - Content = new ContentPresenter + Child = new ContentPresenter { [~ContentPresenter.ContentProperty] = parent.GetObservable(ContentControl.ContentProperty), } diff --git a/Tests/Perspex.Controls.UnitTests/Templates/TemplateExtensionsTests.cs b/Tests/Perspex.Controls.UnitTests/Templates/TemplateExtensionsTests.cs index dd87fa9328..7cc93b7d1d 100644 --- a/Tests/Perspex.Controls.UnitTests/Templates/TemplateExtensionsTests.cs +++ b/Tests/Perspex.Controls.UnitTests/Templates/TemplateExtensionsTests.cs @@ -31,11 +31,11 @@ namespace Perspex.Controls.Templates.UnitTests var border5 = new Border { Name = "border5", TemplatedParent = null }; target.AddVisualChild(border1); - border1.Content = inner; + border1.Child = inner; inner.AddVisualChild(border2); inner.AddVisualChild(border3); - border3.Content = border4; - border4.Content = border5; + border3.Child = border4; + border4.Child = border5; var result = target.GetTemplateChildren().Select(x => x.Name).ToArray(); diff --git a/Tests/Perspex.Layout.UnitTests/FullLayoutTests.cs b/Tests/Perspex.Layout.UnitTests/FullLayoutTests.cs index 00e078e44c..ca838e3c80 100644 --- a/Tests/Perspex.Layout.UnitTests/FullLayoutTests.cs +++ b/Tests/Perspex.Layout.UnitTests/FullLayoutTests.cs @@ -43,9 +43,9 @@ namespace Perspex.Layout.UnitTests { HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, - Content = new Border + Child = new Border { - Content = (textBlock = new TextBlock + Child = (textBlock = new TextBlock { Width = 400, Height = 400, diff --git a/Tests/Perspex.RenderTests/Controls/BorderTests.cs b/Tests/Perspex.RenderTests/Controls/BorderTests.cs index fea61c5f9b..4e2606d8c1 100644 --- a/Tests/Perspex.RenderTests/Controls/BorderTests.cs +++ b/Tests/Perspex.RenderTests/Controls/BorderTests.cs @@ -26,7 +26,7 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { BorderBrush = Brushes.Black, BorderThickness = 1, @@ -45,7 +45,7 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { BorderBrush = Brushes.Black, BorderThickness = 2, @@ -64,7 +64,7 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { Background = Brushes.Red, } @@ -82,11 +82,11 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { BorderBrush = Brushes.Black, BorderThickness = 2, - Content = new Border + Child = new Border { Background = Brushes.Red, } @@ -105,12 +105,12 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { BorderBrush = Brushes.Black, BorderThickness = 2, Padding = new Thickness(2), - Content = new Border + Child = new Border { Background = Brushes.Red, } @@ -129,11 +129,11 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { BorderBrush = Brushes.Black, BorderThickness = 2, - Content = new Border + Child = new Border { Background = Brushes.Red, Margin = new Thickness(2), @@ -153,11 +153,11 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { BorderBrush = Brushes.Black, BorderThickness = 2, - Content = new TextBlock + Child = new TextBlock { Text = "Foo", Background = Brushes.Red, @@ -180,11 +180,11 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { BorderBrush = Brushes.Black, BorderThickness = 2, - Content = new TextBlock + Child = new TextBlock { Text = "Foo", Background = Brushes.Red, @@ -207,11 +207,11 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { BorderBrush = Brushes.Black, BorderThickness = 2, - Content = new TextBlock + Child = new TextBlock { Text = "Foo", Background = Brushes.Red, @@ -234,11 +234,11 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { BorderBrush = Brushes.Black, BorderThickness = 2, - Content = new TextBlock + Child = new TextBlock { Text = "Foo", Background = Brushes.Red, @@ -261,11 +261,11 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { BorderBrush = Brushes.Black, BorderThickness = 2, - Content = new TextBlock + Child = new TextBlock { Text = "Foo", Background = Brushes.Red, @@ -288,11 +288,11 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { BorderBrush = Brushes.Black, BorderThickness = 2, - Content = new TextBlock + Child = new TextBlock { Text = "Foo", Background = Brushes.Red, @@ -315,11 +315,11 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { BorderBrush = Brushes.Black, BorderThickness = 2, - Content = new TextBlock + Child = new TextBlock { Text = "Foo", Background = Brushes.Red, @@ -342,11 +342,11 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { BorderBrush = Brushes.Black, BorderThickness = 2, - Content = new TextBlock + Child = new TextBlock { Text = "Foo", Background = Brushes.Red, @@ -369,14 +369,14 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Border + Child = new Border { Background = Brushes.Coral, Width = 100, Height = 100, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, - Content = new Border + Child = new Border { Margin = new Thickness(25), Background = Brushes.Chocolate, diff --git a/Tests/Perspex.RenderTests/Controls/ImageTests.cs b/Tests/Perspex.RenderTests/Controls/ImageTests.cs index c15d975c76..90511ac125 100644 --- a/Tests/Perspex.RenderTests/Controls/ImageTests.cs +++ b/Tests/Perspex.RenderTests/Controls/ImageTests.cs @@ -30,10 +30,10 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(20, 8), Width = 200, Height = 200, - Content = new Border + Child = new Border { Background = Brushes.Red, - Content = new Image + Child = new Image { Source = this.bitmap, Stretch = Stretch.None, @@ -53,10 +53,10 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(20, 8), Width = 200, Height = 200, - Content = new Border + Child = new Border { Background = Brushes.Red, - Content = new Image + Child = new Image { Source = this.bitmap, Stretch = Stretch.Fill, @@ -76,10 +76,10 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(20, 8), Width = 200, Height = 200, - Content = new Border + Child = new Border { Background = Brushes.Red, - Content = new Image + Child = new Image { Source = this.bitmap, Stretch = Stretch.Uniform, @@ -99,10 +99,10 @@ namespace Perspex.Direct2D1.RenderTests.Controls Padding = new Thickness(20, 8), Width = 200, Height = 200, - Content = new Border + Child = new Border { Background = Brushes.Red, - Content = new Image + Child = new Image { Source = this.bitmap, Stretch = Stretch.UniformToFill, diff --git a/Tests/Perspex.RenderTests/Shapes/EllipseTests.cs b/Tests/Perspex.RenderTests/Shapes/EllipseTests.cs index aa1af64bdd..87a5bd3b7d 100644 --- a/Tests/Perspex.RenderTests/Shapes/EllipseTests.cs +++ b/Tests/Perspex.RenderTests/Shapes/EllipseTests.cs @@ -26,7 +26,7 @@ namespace Perspex.Direct2D1.RenderTests.Shapes Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Ellipse + Child = new Ellipse { Stroke = Brushes.Black, StrokeThickness = 1, diff --git a/Tests/Perspex.RenderTests/Shapes/PathTests.cs b/Tests/Perspex.RenderTests/Shapes/PathTests.cs index 413d257297..53a473f1ea 100644 --- a/Tests/Perspex.RenderTests/Shapes/PathTests.cs +++ b/Tests/Perspex.RenderTests/Shapes/PathTests.cs @@ -26,7 +26,7 @@ namespace Perspex.Direct2D1.RenderTests.Shapes { Width = 200, Height = 200, - Content = new Path + Child = new Path { Fill = Brushes.Gray, Stroke = Brushes.Red, @@ -48,7 +48,7 @@ namespace Perspex.Direct2D1.RenderTests.Shapes { Width = 200, Height = 200, - Content = new Path + Child = new Path { Fill = Brushes.Gray, Stroke = Brushes.Red, @@ -71,7 +71,7 @@ namespace Perspex.Direct2D1.RenderTests.Shapes { Width = 200, Height = 200, - Content = new Path + Child = new Path { Fill = Brushes.Gray, Stroke = Brushes.Red, @@ -94,13 +94,13 @@ namespace Perspex.Direct2D1.RenderTests.Shapes { Width = 200, Height = 200, - Content = new Border + Child = new Border { BorderBrush = Brushes.Red, BorderThickness = 1, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, - Content = new Path + Child = new Path { Fill = Brushes.Black, Stroke = Brushes.Black, diff --git a/Tests/Perspex.RenderTests/Shapes/RectangleTests.cs b/Tests/Perspex.RenderTests/Shapes/RectangleTests.cs index 7428a78c20..66aa8d0cb8 100644 --- a/Tests/Perspex.RenderTests/Shapes/RectangleTests.cs +++ b/Tests/Perspex.RenderTests/Shapes/RectangleTests.cs @@ -26,7 +26,7 @@ namespace Perspex.Direct2D1.RenderTests.Shapes Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Rectangle + Child = new Rectangle { Stroke = Brushes.Black, StrokeThickness = 1, @@ -45,7 +45,7 @@ namespace Perspex.Direct2D1.RenderTests.Shapes Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Rectangle + Child = new Rectangle { Stroke = Brushes.Black, StrokeThickness = 2, @@ -64,7 +64,7 @@ namespace Perspex.Direct2D1.RenderTests.Shapes Padding = new Thickness(8), Width = 200, Height = 200, - Content = new Rectangle + Child = new Rectangle { Stroke = Brushes.Black, StrokeThickness = 2, diff --git a/Tests/Perspex.SceneGraph.UnitTests/VisualTree/BoundsTrackerTests.cs b/Tests/Perspex.SceneGraph.UnitTests/VisualTree/BoundsTrackerTests.cs index 329583723d..22328112bb 100644 --- a/Tests/Perspex.SceneGraph.UnitTests/VisualTree/BoundsTrackerTests.cs +++ b/Tests/Perspex.SceneGraph.UnitTests/VisualTree/BoundsTrackerTests.cs @@ -25,10 +25,10 @@ namespace Perspex.SceneGraph.UnitTests.VisualTree var tree = new Decorator { Padding = new Thickness(10), - Content = new Decorator + Child = new Decorator { Padding = new Thickness(5), - Content = (control = new Rectangle + Child = (control = new Rectangle { Width = 15, Height = 15, diff --git a/Tests/Perspex.Styling.UnitTests/SelectorTests_Template.cs b/Tests/Perspex.Styling.UnitTests/SelectorTests_Template.cs index e83a538265..bc2058b0a1 100644 --- a/Tests/Perspex.Styling.UnitTests/SelectorTests_Template.cs +++ b/Tests/Perspex.Styling.UnitTests/SelectorTests_Template.cs @@ -117,7 +117,7 @@ namespace Perspex.Styling.UnitTests new Border { [Border.TemplatedParentProperty] = templatedControl.Object, - Content = new TextBlock + Child = new TextBlock { [Border.TemplatedParentProperty] = templatedControl.Object, },