chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix vertical issue, fix coerce typo.

Browse Source
This commit is contained in:
rabbitism
2024-01-20 00:37:26 +08:00
parent d847540798
commit 63f82821e5
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
demo/Ursa.Demo/Pages/RangeSliderDemo.axaml
View File

@@ -17,5 +17,6 @@
<u:NumericDoubleUpDown InnerLeftContent="Maximum" Value="{Binding #range.Maximum, Mode=TwoWay}" /> <u:NumericDoubleUpDown InnerLeftContent="Maximum" Value="{Binding #range.Maximum, Mode=TwoWay}" />
<u:NumericDoubleUpDown InnerLeftContent="LowerValue" Value="{Binding #range.LowerValue, Mode=TwoWay}" /> <u:NumericDoubleUpDown InnerLeftContent="LowerValue" Value="{Binding #range.LowerValue, Mode=TwoWay}" />
<u:NumericDoubleUpDown InnerLeftContent="UpperValue" Value="{Binding #range.UpperValue, Mode=TwoWay}" /> <u:NumericDoubleUpDown InnerLeftContent="UpperValue" Value="{Binding #range.UpperValue, Mode=TwoWay}" />
<u:RangeSlider TickFrequency="5" Orientation="Vertical" Height="300"></u:RangeSlider>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

2
src/Ursa.Themes.Semi/Controls/RangeSlider.axaml
View File

@@ -54,6 +54,7 @@
Grid.Row="1" Grid.Row="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Orientation="{Binding Orientation, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
LowerValue="{Binding LowerValue, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" LowerValue="{Binding LowerValue, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
@@ -144,6 +145,7 @@
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Orientation="{Binding Orientation, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
LowerValue="{Binding LowerValue, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" LowerValue="{Binding LowerValue, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"

4
src/Ursa/Controls/RangeSlider/RangeTrack.cs
View File

@@ -234,12 +234,12 @@ public class RangeTrack: Control
{ {
return ValidateDouble(value) return ValidateDouble(value)
? Math.Max(value, sender.GetValue(MinimumProperty)) ? Math.Max(value, sender.GetValue(MinimumProperty))
: sender.GetValue(MinimumProperty); : sender.GetValue(MaximumProperty);
} }
private static double CoerceMinimum(AvaloniaObject sender, double value) 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) private static double CoerceLowerValue(AvaloniaObject sender, double value)