Skip to content

Commit 1d181c8

Browse files
NaBianNaBian
committed
chore: modify Slider template.
1 parent b4734cd commit 1d181c8

File tree

4 files changed

+83
-152
lines changed

4 files changed

+83
-152
lines changed

‎src/Avalonia/HandyControl_Avalonia/Themes/Styles/Slider.axaml‎

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,42 @@
11
<ResourceDictionary xmlns="https://github.com/avaloniaui"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:hc="clr-namespace:HandyControl.Controls">
4-
<ControlTheme x:Key="SliderRepeatButtonStyle"
4+
<ControlTheme x:Key="SliderRepeatButtonHorizontalStyle"
55
TargetType="RepeatButton">
66
<Setter Property="Background"
77
Value="Transparent" />
88
<Setter Property="Focusable"
99
Value="False" />
10+
<Setter Property="IsTabStop"
11+
Value="False" />
12+
<Setter Property="Template">
13+
<ControlTemplate>
14+
<Border Background="Transparent"
15+
Height="{TemplateBinding Height}"
16+
Width="{TemplateBinding Width}">
17+
<Rectangle Fill="{TemplateBinding Background}"
18+
Height="2" />
19+
</Border>
20+
</ControlTemplate>
21+
</Setter>
22+
</ControlTheme>
23+
24+
<ControlTheme x:Key="SliderRepeatButtonVerticalStyle"
25+
TargetType="RepeatButton">
26+
<Setter Property="Background"
27+
Value="Transparent" />
28+
<Setter Property="Focusable"
29+
Value="False" />
30+
<Setter Property="IsTabStop"
31+
Value="False" />
1032
<Setter Property="Template">
1133
<ControlTemplate>
12-
<Border Background="{TemplateBinding Background}" />
34+
<Border Background="Transparent"
35+
Height="{TemplateBinding Height}"
36+
Width="{TemplateBinding Width}">
37+
<Rectangle Fill="{TemplateBinding Background}"
38+
Width="2" />
39+
</Border>
1340
</ControlTemplate>
1441
</Setter>
1542
</ControlTheme>
@@ -322,13 +349,11 @@
322349
<Track.DecreaseButton>
323350
<RepeatButton Name="PART_DecreaseButton"
324351
Background="{DynamicResource PrimaryBrush}"
325-
Theme="{StaticResource SliderRepeatButtonStyle}"
326-
Height="2" />
352+
Theme="{StaticResource SliderRepeatButtonHorizontalStyle}" />
327353
</Track.DecreaseButton>
328354
<Track.IncreaseButton>
329355
<RepeatButton Name="PART_IncreaseButton"
330-
Theme="{StaticResource SliderRepeatButtonStyle}"
331-
Height="2" />
356+
Theme="{StaticResource SliderRepeatButtonHorizontalStyle}" />
332357
</Track.IncreaseButton>
333358
<Thumb Margin="-9,0"
334359
Theme="{StaticResource SliderThumb}" />
@@ -386,13 +411,11 @@
386411
<Track.DecreaseButton>
387412
<RepeatButton Name="PART_DecreaseButton"
388413
Background="{DynamicResource PrimaryBrush}"
389-
Theme="{StaticResource SliderRepeatButtonStyle}"
390-
Width="2" />
414+
Theme="{StaticResource SliderRepeatButtonVerticalStyle}" />
391415
</Track.DecreaseButton>
392416
<Track.IncreaseButton>
393417
<RepeatButton Name="PART_IncreaseButton"
394-
Theme="{StaticResource SliderRepeatButtonStyle}"
395-
Width="2" />
418+
Theme="{StaticResource SliderRepeatButtonVerticalStyle}" />
396419
</Track.IncreaseButton>
397420
<Thumb Margin="0,-9"
398421
Theme="{StaticResource SliderThumb}" />

‎src/Net_40/HandyControl_Net_40/Themes/Theme.xaml‎

Lines changed: 16 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -418,36 +418,6 @@
418418
</Setter.Value>
419419
</Setter>
420420
</Style>
421-
<Style x:Key="PreviewSliderRepeatButtonHorizontalStyle" TargetType="RepeatButton">
422-
<Setter Property="OverridesDefaultStyle" Value="true" />
423-
<Setter Property="Background" Value="Transparent" />
424-
<Setter Property="Focusable" Value="false" />
425-
<Setter Property="IsTabStop" Value="false" />
426-
<Setter Property="Template">
427-
<Setter.Value>
428-
<ControlTemplate TargetType="RepeatButton">
429-
<Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
430-
<Rectangle Fill="{TemplateBinding Background}" Height="2" />
431-
</Border>
432-
</ControlTemplate>
433-
</Setter.Value>
434-
</Setter>
435-
</Style>
436-
<Style x:Key="PreviewSliderRepeatButtonVerticalStyle" TargetType="RepeatButton">
437-
<Setter Property="OverridesDefaultStyle" Value="true" />
438-
<Setter Property="Background" Value="Transparent" />
439-
<Setter Property="Focusable" Value="false" />
440-
<Setter Property="IsTabStop" Value="false" />
441-
<Setter Property="Template">
442-
<Setter.Value>
443-
<ControlTemplate TargetType="RepeatButton">
444-
<Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
445-
<Rectangle Fill="{TemplateBinding Background}" Width="2" />
446-
</Border>
447-
</ControlTemplate>
448-
</Setter.Value>
449-
</Setter>
450-
</Style>
451421
<Style x:Key="ScrollBarBaseRepeatButton" TargetType="RepeatButton">
452422
<Setter Property="OverridesDefaultStyle" Value="true" />
453423
<Setter Property="Background" Value="Transparent" />
@@ -1667,10 +1637,10 @@
16671637
<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Height="2" VerticalAlignment="center" Margin="9,0" />
16681638
<Track VerticalAlignment="center" Margin="9,0" x:Name="PART_Track">
16691639
<Track.DecreaseRepeatButton>
1670-
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource PreviewSliderRepeatButtonHorizontalStyle}" />
1640+
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
16711641
</Track.DecreaseRepeatButton>
16721642
<Track.IncreaseRepeatButton>
1673-
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource PreviewSliderRepeatButtonHorizontalStyle}" />
1643+
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
16741644
</Track.IncreaseRepeatButton>
16751645
<Track.Thumb>
16761646
<Thumb Margin="-9,0" x:Name="PART_Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource PreviewSliderThumb}" VerticalAlignment="Center" Width="18" />
@@ -1683,10 +1653,10 @@
16831653
<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Width="2" HorizontalAlignment="center" Margin="0,9" />
16841654
<Track HorizontalAlignment="center" Margin="0,9" x:Name="PART_Track">
16851655
<Track.DecreaseRepeatButton>
1686-
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource PreviewSliderRepeatButtonVerticalStyle}" />
1656+
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
16871657
</Track.DecreaseRepeatButton>
16881658
<Track.IncreaseRepeatButton>
1689-
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource PreviewSliderRepeatButtonVerticalStyle}" />
1659+
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
16901660
</Track.IncreaseRepeatButton>
16911661
<Track.Thumb>
16921662
<Thumb Margin="0,-9" x:Name="PART_Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource PreviewSliderThumb}" HorizontalAlignment="Center" Width="18" />
@@ -14037,8 +14007,8 @@
1403714007
<ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto" />
1403814008
<ColumnDefinition Width="Auto" />
1403914009
</Grid.ColumnDefinitions>
14040-
<TickBar x:Name="TopTick" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4" />
14041-
<TickBar x:Name="BottomTick" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4" />
14010+
<TickBar x:Name="LeftTick" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4" />
14011+
<TickBar x:Name="RightTick" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4" />
1404214012
<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Column="1" HorizontalAlignment="center" Margin="0,9" Width="2">
1404314013
<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
1404414014
<Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Width="2" />
@@ -14072,14 +14042,14 @@
1407214042
<Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbVerticalRight}" />
1407314043
</MultiTrigger>
1407414044
<Trigger Property="TickPlacement" Value="TopLeft">
14075-
<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
14045+
<Setter Property="Visibility" TargetName="LeftTick" Value="Visible" />
1407614046
</Trigger>
1407714047
<Trigger Property="TickPlacement" Value="BottomRight">
14078-
<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
14048+
<Setter Property="Visibility" TargetName="RightTick" Value="Visible" />
1407914049
</Trigger>
1408014050
<Trigger Property="TickPlacement" Value="Both">
14081-
<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
14082-
<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
14051+
<Setter Property="Visibility" TargetName="LeftTick" Value="Visible" />
14052+
<Setter Property="Visibility" TargetName="RightTick" Value="Visible" />
1408314053
</Trigger>
1408414054
<Trigger Property="IsSelectionRangeEnabled" Value="true">
1408514055
<Setter Property="Visibility" TargetName="Canvas_SelectionRange" Value="Visible" />
@@ -14285,8 +14255,8 @@
1428514255
<ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto" />
1428614256
<ColumnDefinition Width="Auto" />
1428714257
</Grid.ColumnDefinitions>
14288-
<TickBar x:Name="TopTick" Height="{Binding ActualHeight,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4" />
14289-
<TickBar x:Name="BottomTick" Height="{Binding ActualHeight,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4" />
14258+
<TickBar x:Name="LeftTick" Height="{Binding ActualHeight,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4" />
14259+
<TickBar x:Name="RightTick" Height="{Binding ActualHeight,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4" />
1429014260
<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Margin="0,9" Grid.Column="1" HorizontalAlignment="center" Width="2" />
1429114261
<hc:RangeTrack IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="{TemplateBinding Orientation}" ValueStart="{TemplateBinding ValueStart}" ValueEnd="{TemplateBinding ValueEnd}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Margin="0,9" x:Name="PART_Track" Grid.Column="1">
1429214262
<hc:RangeTrack.DecreaseRepeatButton>
@@ -14324,14 +14294,14 @@
1432414294
<Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbVerticalRight}" />
1432514295
</MultiTrigger>
1432614296
<Trigger Property="TickPlacement" Value="TopLeft">
14327-
<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
14297+
<Setter Property="Visibility" TargetName="LeftTick" Value="Visible" />
1432814298
</Trigger>
1432914299
<Trigger Property="TickPlacement" Value="BottomRight">
14330-
<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
14300+
<Setter Property="Visibility" TargetName="RightTick" Value="Visible" />
1433114301
</Trigger>
1433214302
<Trigger Property="TickPlacement" Value="Both">
14333-
<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
14334-
<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
14303+
<Setter Property="Visibility" TargetName="LeftTick" Value="Visible" />
14304+
<Setter Property="Visibility" TargetName="RightTick" Value="Visible" />
1433514305
</Trigger>
1433614306
</ControlTemplate.Triggers>
1433714307
</ControlTemplate>

0 commit comments

Comments
 (0)