Browse Source

Merge branch 'master' into fixes/selecteditems-binding

pull/5817/head
Dariusz Komosiński 5 years ago
committed by GitHub
parent
commit
a25a8cf338
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/Avalonia.Controls/NativeControlHost.cs
  2. 2
      src/Avalonia.Controls/ScrollViewer.cs
  3. 2
      tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs
  4. 4
      tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs

2
src/Avalonia.Controls/NativeControlHost.cs

@ -120,7 +120,7 @@ namespace Avalonia.Controls
private Rect? GetAbsoluteBounds()
{
var bounds = Bounds;
var position = this.TranslatePoint(bounds.Position, _currentRoot);
var position = this.TranslatePoint(default, _currentRoot);
if (position == null)
return null;
return new Rect(position.Value, bounds.Size);

2
src/Avalonia.Controls/ScrollViewer.cs

@ -120,7 +120,7 @@ namespace Avalonia.Controls
public static readonly AttachedProperty<ScrollBarVisibility> HorizontalScrollBarVisibilityProperty =
AvaloniaProperty.RegisterAttached<ScrollViewer, Control, ScrollBarVisibility>(
nameof(HorizontalScrollBarVisibility),
ScrollBarVisibility.Hidden);
ScrollBarVisibility.Disabled);
/// <summary>
/// Defines the VerticalScrollBarMaximum property.

2
tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs

@ -37,7 +37,7 @@ namespace Avalonia.Controls.UnitTests
target.HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled;
target.HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
Assert.Equal(new[] { true, false, true }, values);
Assert.Equal(new[] { false, true }, values);
}
[Fact]

4
tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs

@ -162,7 +162,7 @@ namespace Avalonia.Layout.UnitTests
{
var root = CreateRoot();
var target = new Canvas { Width = 200, Height = 200 };
var scroller = new ScrollViewer { Width = 100, Height = 100, Content = target, Template = ScrollViewerTemplate() };
var scroller = new ScrollViewer { Width = 100, Height = 100, Content = target, Template = ScrollViewerTemplate(), HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden };
var raised = 0;
target.EffectiveViewportChanged += (s, e) =>
@ -185,7 +185,7 @@ namespace Avalonia.Layout.UnitTests
{
var root = CreateRoot();
var target = new Canvas { Width = 200, Height = 200 };
var scroller = new ScrollViewer { Width = 100, Height = 100, Content = target, Template = ScrollViewerTemplate() };
var scroller = new ScrollViewer { Width = 100, Height = 100, Content = target, Template = ScrollViewerTemplate(), HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden };
var raised = 0;
root.Child = scroller;

Loading…
Cancel
Save