Merge branch 'master' into fixes/selecteditems-binding

AvaloniaUI · Apr 21, 2021 · a25a8cf · a25a8cf
2 parents eeb7c8d + 4fbc06e
commit a25a8cf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Avalonia.Controls/NativeControlHost.cs b/src/Avalonia.Controls/NativeControlHost.cs
@@ -120,7 +120,7 @@ private void UpdateHost()
         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);

diff --git a/src/Avalonia.Controls/ScrollViewer.cs b/src/Avalonia.Controls/ScrollViewer.cs
@@ -120,7 +120,7 @@ public class ScrollViewer : ContentControl, IScrollable, IScrollAnchorProvider
         public static readonly AttachedProperty<ScrollBarVisibility> HorizontalScrollBarVisibilityProperty =
             AvaloniaProperty.RegisterAttached<ScrollViewer, Control, ScrollBarVisibility>(
                 nameof(HorizontalScrollBarVisibility),
-                ScrollBarVisibility.Hidden);
+                ScrollBarVisibility.Disabled);
 
         /// <summary>
         /// Defines the VerticalScrollBarMaximum property.

diff --git a/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs b/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs
@@ -37,7 +37,7 @@ public void CanHorizontallyScroll_Should_Track_HorizontalScrollBarVisibility()
             target.HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled;
             target.HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
 
-            Assert.Equal(new[] { true, false, true }, values);
+            Assert.Equal(new[] { false, true }, values);
         }
 
         [Fact]

diff --git a/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs b/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs
@@ -162,7 +162,7 @@ public async Task ScrollViewer_Determines_EffectiveViewport()
             {
                 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 @@ public async Task Scrolled_ScrollViewer_Determines_EffectiveViewport()
             {
                 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;