diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs index 2ef0af2852..31113812d1 100644 --- a/src/Avalonia.Controls/Slider.cs +++ b/src/Avalonia.Controls/Slider.cs @@ -17,7 +17,7 @@ namespace Avalonia.Controls /// Defines the property. /// public static readonly StyledProperty OrientationProperty = - AvaloniaProperty.Register(nameof(Orientation), Orientation.Horizontal); + ScrollBar.OrientationProperty.AddOwner(); /// /// Defines the property. @@ -41,8 +41,7 @@ namespace Avalonia.Controls /// static Slider() { - PseudoClass(OrientationProperty, o => o == Avalonia.Controls.Orientation.Vertical, ":vertical"); - PseudoClass(OrientationProperty, o => o == Avalonia.Controls.Orientation.Horizontal, ":horizontal"); + OrientationProperty.OverrideDefaultValue(typeof(Slider), Orientation.Horizontal); Thumb.DragStartedEvent.AddClassHandler(x => x.OnThumbDragStarted, RoutingStrategies.Bubble); Thumb.DragDeltaEvent.AddClassHandler(x => x.OnThumbDragDelta, RoutingStrategies.Bubble); Thumb.DragCompletedEvent.AddClassHandler(x => x.OnThumbDragCompleted, RoutingStrategies.Bubble); diff --git a/tests/Avalonia.Controls.UnitTests/SliderTests.cs b/tests/Avalonia.Controls.UnitTests/SliderTests.cs new file mode 100644 index 0000000000..dc47d9eb89 --- /dev/null +++ b/tests/Avalonia.Controls.UnitTests/SliderTests.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Xunit; + +namespace Avalonia.Controls.UnitTests +{ + public class SliderTests + { + [Fact] + public void Default_Orientation_Should_Be_Horizontal() + { + var slider = new Slider(); + Assert.Equal(Orientation.Horizontal, slider.Orientation); + } + + [Fact] + public void Should_Set_Horizontal_Class() + { + var slider = new Slider + { + Orientation = Orientation.Horizontal + }; + + Assert.Contains(slider.Classes, ":horizontal".Equals); + } + + [Fact] + public void Should_Set_Vertical_Class() + { + var slider = new Slider + { + Orientation = Orientation.Vertical + }; + + Assert.Contains(slider.Classes, ":vertical".Equals); + } + } +}