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

Renamed AsBinding -> ToBinding.

pull/766/head
Steven Kirk 9 years ago
parent
d35c483b64
commit
1b4ebf5b1d
6 changed files with 20 additions and 14 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. 8
      src/Avalonia.Base/AvaloniaObjectExtensions.cs
  2. 8
      src/Avalonia.Diagnostics/Views/ControlDetailsView.cs
  3. 4
      tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs
  4. 8
      tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
  5. 4
      tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
  6. 2
      tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs

8
src/Avalonia.Base/AvaloniaObjectExtensions.cs
View File

@ -16,7 +16,13 @@ namespace Avalonia
/// </summary> /// </summary>
public static class AvaloniaObjectExtensions public static class AvaloniaObjectExtensions
{ {
public static IBinding AsBinding<T>(this IObservable<T> source) /// <summary>
/// Converts an <see cref="IObservable{T}"/> to an <see cref="IBinding"/>.
/// </summary>
/// <typeparam name="T">The type produced by the observable.</typeparam>
/// <param name="source">The observable</param>
/// <returns>An <see cref="IBinding"/>.</returns>
public static IBinding ToBinding<T>(this IObservable<T> source)
{ {
return new BindingAdaptor(source.Select(x => (object)x)); return new BindingAdaptor(source.Select(x => (object)x));
} }

8
src/Avalonia.Diagnostics/Views/ControlDetailsView.cs
View File

@ -49,7 +49,7 @@ namespace Avalonia.Diagnostics.Views
}, },
}, },
[GridRepeater.TemplateProperty] = pt, [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, TextWrapping = TextWrapping.NoWrap,
[!ToolTip.TipProperty] = property [!ToolTip.TipProperty] = property
.WhenAnyValue(x => x.Diagnostic) .WhenAnyValue(x => x.Diagnostic)
.AsBinding(), .ToBinding(),
}; };
yield return new TextBlock yield return new TextBlock
@ -73,13 +73,13 @@ namespace Avalonia.Diagnostics.Views
[!TextBlock.TextProperty] = property [!TextBlock.TextProperty] = property
.WhenAnyValue(v => v.Value) .WhenAnyValue(v => v.Value)
.Select(v => v?.ToString()) .Select(v => v?.ToString())
.AsBinding(), .ToBinding(),
}; };
yield return new TextBlock yield return new TextBlock
{ {
TextWrapping = TextWrapping.NoWrap, TextWrapping = TextWrapping.NoWrap,
[!TextBlock.TextProperty] = property.WhenAnyValue(x => x.Priority).AsBinding(), [!TextBlock.TextProperty] = property.WhenAnyValue(x => x.Priority).ToBinding(),
}; };
} }
} }

4
tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_DataValidation.cs
View File

@ -56,7 +56,7 @@ namespace Avalonia.Base.UnitTests
var source = new Subject<object>(); var source = new Subject<object>();
var target = new Class1 var target = new Class1
{ {
[!Class1.NonValidatedProperty] = source.AsBinding(), [!Class1.NonValidatedProperty] = source.ToBinding(),
}; };
source.OnNext(new BindingNotification(6)); source.OnNext(new BindingNotification(6));
@ -73,7 +73,7 @@ namespace Avalonia.Base.UnitTests
var source = new Subject<object>(); var source = new Subject<object>();
var target = new Class1 var target = new Class1
{ {
[!Class1.ValidatedDirectProperty] = source.AsBinding(), [!Class1.ValidatedDirectProperty] = source.ToBinding(),
}; };
source.OnNext(new BindingNotification(6)); source.OnNext(new BindingNotification(6));

8
tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
View File

@ -163,9 +163,9 @@ namespace Avalonia.Controls.UnitTests
Content = new ItemsPresenter Content = new ItemsPresenter
{ {
Name = "PART_ItemsPresenter", Name = "PART_ItemsPresenter",
[~ItemsPresenter.ItemsProperty] = parent.GetObservable(ItemsControl.ItemsProperty).AsBinding(), [~ItemsPresenter.ItemsProperty] = parent.GetObservable(ItemsControl.ItemsProperty).ToBinding(),
[~ItemsPresenter.ItemsPanelProperty] = parent.GetObservable(ItemsControl.ItemsPanelProperty).AsBinding(), [~ItemsPresenter.ItemsPanelProperty] = parent.GetObservable(ItemsControl.ItemsPanelProperty).ToBinding(),
[~ItemsPresenter.VirtualizationModeProperty] = parent.GetObservable(ListBox.VirtualizationModeProperty).AsBinding(), [~ItemsPresenter.VirtualizationModeProperty] = parent.GetObservable(ListBox.VirtualizationModeProperty).ToBinding(),
} }
}); });
} }
@ -187,7 +187,7 @@ namespace Avalonia.Controls.UnitTests
new ScrollContentPresenter new ScrollContentPresenter
{ {
Name = "PART_ContentPresenter", Name = "PART_ContentPresenter",
[~ScrollContentPresenter.ContentProperty] = parent.GetObservable(ScrollViewer.ContentProperty).AsBinding(), [~ScrollContentPresenter.ContentProperty] = parent.GetObservable(ScrollViewer.ContentProperty).ToBinding(),
[~~ScrollContentPresenter.ExtentProperty] = parent[~~ScrollViewer.ExtentProperty], [~~ScrollContentPresenter.ExtentProperty] = parent[~~ScrollViewer.ExtentProperty],
[~~ScrollContentPresenter.OffsetProperty] = parent[~~ScrollViewer.OffsetProperty], [~~ScrollContentPresenter.OffsetProperty] = parent[~~ScrollViewer.OffsetProperty],
[~~ScrollContentPresenter.ViewportProperty] = parent[~~ScrollViewer.ViewportProperty], [~~ScrollContentPresenter.ViewportProperty] = parent[~~ScrollViewer.ViewportProperty],

4
tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
View File

@ -207,7 +207,7 @@ namespace Avalonia.Controls.UnitTests
Content = new ItemsPresenter Content = new ItemsPresenter
{ {
Name = "PART_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 return new ScrollContentPresenter
{ {
Name = "PART_ContentPresenter", Name = "PART_ContentPresenter",
[~ContentPresenter.ContentProperty] = parent.GetObservable(ContentControl.ContentProperty).AsBinding(), [~ContentPresenter.ContentProperty] = parent.GetObservable(ContentControl.ContentProperty).ToBinding(),
}; };
} }

2
tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs
View File

@ -224,7 +224,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
{ {
Child = new ContentPresenter Child = new ContentPresenter
{ {
[~ContentPresenter.ContentProperty] = parent.GetObservable(ContentControl.ContentProperty).AsBinding(), [~ContentPresenter.ContentProperty] = parent.GetObservable(ContentControl.ContentProperty).ToBinding(),
} }
}; };
}), }),

Write Preview
Loading…
Cancel
Save