From 1b4ebf5b1d361abbe12effc4bbf695bd5abf12d5 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 14 Oct 2016 12:32:07 +0200 Subject: [PATCH] Renamed AsBinding -> ToBinding. --- src/Avalonia.Base/AvaloniaObjectExtensions.cs | 8 +++++++- src/Avalonia.Diagnostics/Views/ControlDetailsView.cs | 8 ++++---- .../AvaloniaObjectTests_DataValidation.cs | 4 ++-- tests/Avalonia.Controls.UnitTests/ListBoxTests.cs | 8 ++++---- tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs | 4 ++-- .../Primitives/TemplatedControlTests.cs | 2 +- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/Avalonia.Base/AvaloniaObjectExtensions.cs b/src/Avalonia.Base/AvaloniaObjectExtensions.cs index 3ca55529e6..685bf83a75 100644 --- a/src/Avalonia.Base/AvaloniaObjectExtensions.cs +++ b/src/Avalonia.Base/AvaloniaObjectExtensions.cs @@ -16,7 +16,13 @@ namespace Avalonia /// public static class AvaloniaObjectExtensions { - public static IBinding AsBinding(this IObservable source) + /// + /// Converts an to an . + /// + /// The type produced by the observable. + /// The observable + /// An . + public static IBinding ToBinding(this IObservable source) { return new BindingAdaptor(source.Select(x => (object)x)); } diff --git a/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs b/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs index 3cde8bb49d..7cb74ebb33 100644 --- a/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs +++ b/src/Avalonia.Diagnostics/Views/ControlDetailsView.cs @@ -49,7 +49,7 @@ namespace Avalonia.Diagnostics.Views }, }, [GridRepeater.TemplateProperty] = pt, - [!GridRepeater.ItemsProperty] = this.WhenAnyValue(x => x.ViewModel.Properties).AsBinding(), + [!GridRepeater.ItemsProperty] = this.WhenAnyValue(x => x.ViewModel.Properties).ToBinding(), } }; } @@ -64,7 +64,7 @@ namespace Avalonia.Diagnostics.Views TextWrapping = TextWrapping.NoWrap, [!ToolTip.TipProperty] = property .WhenAnyValue(x => x.Diagnostic) - .AsBinding(), + .ToBinding(), }; yield return new TextBlock @@ -73,13 +73,13 @@ namespace Avalonia.Diagnostics.Views [!TextBlock.TextProperty] = property .WhenAnyValue(v => v.Value) .Select(v => v?.ToString()) - .AsBinding(), + .ToBinding(), }; yield return new TextBlock { TextWrapping = TextWrapping.NoWrap, - [!TextBlock.TextProperty] = property.WhenAnyValue(x => x.Priority).AsBinding(), + [!TextBlock.TextProperty] = property.WhenAnyValue(x => x.Priority).ToBinding(), }; } } diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs index c8436c376f..b12b2e3c31 100644 --- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs +++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs @@ -56,7 +56,7 @@ namespace Avalonia.Base.UnitTests var source = new Subject(); var target = new Class1 { - [!Class1.NonValidatedProperty] = source.AsBinding(), + [!Class1.NonValidatedProperty] = source.ToBinding(), }; source.OnNext(new BindingNotification(6)); @@ -73,7 +73,7 @@ namespace Avalonia.Base.UnitTests var source = new Subject(); var target = new Class1 { - [!Class1.ValidatedDirectProperty] = source.AsBinding(), + [!Class1.ValidatedDirectProperty] = source.ToBinding(), }; source.OnNext(new BindingNotification(6)); diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs index 99e44c8d2c..f8eea8c4eb 100644 --- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs @@ -163,9 +163,9 @@ namespace Avalonia.Controls.UnitTests Content = new ItemsPresenter { Name = "PART_ItemsPresenter", - [~ItemsPresenter.ItemsProperty] = parent.GetObservable(ItemsControl.ItemsProperty).AsBinding(), - [~ItemsPresenter.ItemsPanelProperty] = parent.GetObservable(ItemsControl.ItemsPanelProperty).AsBinding(), - [~ItemsPresenter.VirtualizationModeProperty] = parent.GetObservable(ListBox.VirtualizationModeProperty).AsBinding(), + [~ItemsPresenter.ItemsProperty] = parent.GetObservable(ItemsControl.ItemsProperty).ToBinding(), + [~ItemsPresenter.ItemsPanelProperty] = parent.GetObservable(ItemsControl.ItemsPanelProperty).ToBinding(), + [~ItemsPresenter.VirtualizationModeProperty] = parent.GetObservable(ListBox.VirtualizationModeProperty).ToBinding(), } }); } @@ -187,7 +187,7 @@ namespace Avalonia.Controls.UnitTests new ScrollContentPresenter { Name = "PART_ContentPresenter", - [~ScrollContentPresenter.ContentProperty] = parent.GetObservable(ScrollViewer.ContentProperty).AsBinding(), + [~ScrollContentPresenter.ContentProperty] = parent.GetObservable(ScrollViewer.ContentProperty).ToBinding(), [~~ScrollContentPresenter.ExtentProperty] = parent[~~ScrollViewer.ExtentProperty], [~~ScrollContentPresenter.OffsetProperty] = parent[~~ScrollViewer.OffsetProperty], [~~ScrollContentPresenter.ViewportProperty] = parent[~~ScrollViewer.ViewportProperty], diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs index 9999fa5346..c7992fe80f 100644 --- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs +++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs @@ -207,7 +207,7 @@ namespace Avalonia.Controls.UnitTests Content = new ItemsPresenter { Name = "PART_ItemsPresenter", - [~ItemsPresenter.ItemsProperty] = parent.GetObservable(ItemsControl.ItemsProperty).AsBinding(), + [~ItemsPresenter.ItemsProperty] = parent.GetObservable(ItemsControl.ItemsProperty).ToBinding(), } }; } @@ -217,7 +217,7 @@ namespace Avalonia.Controls.UnitTests return new ScrollContentPresenter { Name = "PART_ContentPresenter", - [~ContentPresenter.ContentProperty] = parent.GetObservable(ContentControl.ContentProperty).AsBinding(), + [~ContentPresenter.ContentProperty] = parent.GetObservable(ContentControl.ContentProperty).ToBinding(), }; } diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs index 960be2ce0e..3c2f2e4f5c 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs @@ -224,7 +224,7 @@ namespace Avalonia.Controls.UnitTests.Primitives { Child = new ContentPresenter { - [~ContentPresenter.ContentProperty] = parent.GetObservable(ContentControl.ContentProperty).AsBinding(), + [~ContentPresenter.ContentProperty] = parent.GetObservable(ContentControl.ContentProperty).ToBinding(), } }; }),