From 63f82821e597f6803b9e718000a1f39bc7cf1564 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Sat, 20 Jan 2024 00:37:26 +0800 Subject: [PATCH] fix vertical issue, fix coerce typo. --- demo/Ursa.Demo/Pages/RangeSliderDemo.axaml | 1 + src/Ursa.Themes.Semi/Controls/RangeSlider.axaml | 2 ++ src/Ursa/Controls/RangeSlider/RangeTrack.cs | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/demo/Ursa.Demo/Pages/RangeSliderDemo.axaml b/demo/Ursa.Demo/Pages/RangeSliderDemo.axaml index aa5bcf6..5f5412a 100644 --- a/demo/Ursa.Demo/Pages/RangeSliderDemo.axaml +++ b/demo/Ursa.Demo/Pages/RangeSliderDemo.axaml @@ -17,5 +17,6 @@ + diff --git a/src/Ursa.Themes.Semi/Controls/RangeSlider.axaml b/src/Ursa.Themes.Semi/Controls/RangeSlider.axaml index f78bd15..529a94a 100644 --- a/src/Ursa.Themes.Semi/Controls/RangeSlider.axaml +++ b/src/Ursa.Themes.Semi/Controls/RangeSlider.axaml @@ -54,6 +54,7 @@ Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" + Orientation="{Binding Orientation, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" LowerValue="{Binding LowerValue, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" @@ -144,6 +145,7 @@ Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" + Orientation="{Binding Orientation, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" LowerValue="{Binding LowerValue, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" diff --git a/src/Ursa/Controls/RangeSlider/RangeTrack.cs b/src/Ursa/Controls/RangeSlider/RangeTrack.cs index f3b80ed..7d2a48b 100644 --- a/src/Ursa/Controls/RangeSlider/RangeTrack.cs +++ b/src/Ursa/Controls/RangeSlider/RangeTrack.cs @@ -234,12 +234,12 @@ public class RangeTrack: Control { return ValidateDouble(value) ? Math.Max(value, sender.GetValue(MinimumProperty)) - : sender.GetValue(MinimumProperty); + : sender.GetValue(MaximumProperty); } private static double CoerceMinimum(AvaloniaObject sender, double value) { - return ValidateDouble(value) ? value : sender.GetValue(MaximumProperty); + return ValidateDouble(value) ? value : sender.GetValue(MinimumProperty); } private static double CoerceLowerValue(AvaloniaObject sender, double value)