Skip to content

Commit c632be5

Browse files
NaBianNaBian
committed
fix: #1797
1 parent 7a9310c commit c632be5

3 files changed

Lines changed: 30 additions & 30 deletions

File tree

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14031,19 +14031,19 @@
1403114031
<TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,0,0,2" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
1403214032
<TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,2,0,0" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
1403314033
<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Row="1" Height="2" VerticalAlignment="center" Margin="9,0">
14034-
<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
14034+
<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden" Margin="-9,0,0,0">
1403514035
<Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Height="2" />
1403614036
</Canvas>
1403714037
</Border>
14038-
<Track Margin="9,0" x:Name="PART_Track" Grid.Row="1">
14038+
<Track x:Name="PART_Track" Grid.Row="1">
1403914039
<Track.DecreaseRepeatButton>
14040-
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
14040+
<RepeatButton Margin="9,0,0,0" Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
1404114041
</Track.DecreaseRepeatButton>
1404214042
<Track.IncreaseRepeatButton>
14043-
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
14043+
<RepeatButton Margin="0,0,9,0" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
1404414044
</Track.IncreaseRepeatButton>
1404514045
<Track.Thumb>
14046-
<Thumb ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" VerticalAlignment="Center" />
14046+
<Thumb ClipToBounds="False" Width="18" Margin="0" Height="18" x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" VerticalAlignment="Center" />
1404714047
</Track.Thumb>
1404814048
</Track>
1404914049
</Grid>
@@ -14087,19 +14087,19 @@
1408714087
<TickBar x:Name="LeftTick" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4" />
1408814088
<TickBar x:Name="RightTick" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4" />
1408914089
<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Column="1" HorizontalAlignment="center" Margin="0,9" Width="2">
14090-
<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
14090+
<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden" Margin="0,-9,0,0">
1409114091
<Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Width="2" />
1409214092
</Canvas>
1409314093
</Border>
14094-
<Track Margin="0,9" x:Name="PART_Track" Grid.Column="1">
14094+
<Track x:Name="PART_Track" Grid.Column="1">
1409514095
<Track.DecreaseRepeatButton>
14096-
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
14096+
<RepeatButton Margin="0,9,0,0" Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
1409714097
</Track.DecreaseRepeatButton>
1409814098
<Track.IncreaseRepeatButton>
14099-
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
14099+
<RepeatButton Margin="0,0,0,9" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
1410014100
</Track.IncreaseRepeatButton>
1410114101
<Track.Thumb>
14102-
<Thumb Margin="0,-9" x:Name="Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" HorizontalAlignment="Center" Width="18" />
14102+
<Thumb Margin="0" x:Name="Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" HorizontalAlignment="Center" Width="18" />
1410314103
</Track.Thumb>
1410414104
</Track>
1410514105
</Grid>

‎src/Shared/HandyControl_Shared/Themes/Styles/Base/SliderBaseStyle.xaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -199,19 +199,19 @@
199199
<TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,0,0,2" Placement="Top" Grid.Row="0" Visibility="Collapsed"/>
200200
<TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,2,0,0" Placement="Bottom" Grid.Row="2" Visibility="Collapsed"/>
201201
<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Row="1" Height="2" VerticalAlignment="center" Margin="9,0">
202-
<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
202+
<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden" Margin="-9,0,0,0">
203203
<Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Height="2"/>
204204
</Canvas>
205205
</Border>
206-
<Track Margin="9,0" x:Name="PART_Track" Grid.Row="1">
206+
<Track x:Name="PART_Track" Grid.Row="1">
207207
<Track.DecreaseRepeatButton>
208-
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}"/>
208+
<RepeatButton Margin="9,0,0,0" Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}"/>
209209
</Track.DecreaseRepeatButton>
210210
<Track.IncreaseRepeatButton>
211-
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}"/>
211+
<RepeatButton Margin="0,0,9,0" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}"/>
212212
</Track.IncreaseRepeatButton>
213213
<Track.Thumb>
214-
<Thumb ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" VerticalAlignment="Center"/>
214+
<Thumb ClipToBounds="False" Width="18" Margin="0" Height="18" x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" VerticalAlignment="Center"/>
215215
</Track.Thumb>
216216
</Track>
217217
</Grid>
@@ -256,19 +256,19 @@
256256
<TickBar x:Name="LeftTick" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4"/>
257257
<TickBar x:Name="RightTick" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4"/>
258258
<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Column="1" HorizontalAlignment="center" Margin="0,9" Width="2">
259-
<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
259+
<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden" Margin="0,-9,0,0">
260260
<Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Width="2"/>
261261
</Canvas>
262262
</Border>
263-
<Track Margin="0,9" x:Name="PART_Track" Grid.Column="1">
263+
<Track x:Name="PART_Track" Grid.Column="1">
264264
<Track.DecreaseRepeatButton>
265-
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}"/>
265+
<RepeatButton Margin="0,9,0,0" Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}"/>
266266
</Track.DecreaseRepeatButton>
267267
<Track.IncreaseRepeatButton>
268-
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}"/>
268+
<RepeatButton Margin="0,0,0,9" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}"/>
269269
</Track.IncreaseRepeatButton>
270270
<Track.Thumb>
271-
<Thumb Margin="0,-9" x:Name="Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" HorizontalAlignment="Center" Width="18"/>
271+
<Thumb Margin="0" x:Name="Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" HorizontalAlignment="Center" Width="18"/>
272272
</Track.Thumb>
273273
</Track>
274274
</Grid>

‎src/Shared/HandyControl_Shared/Themes/Theme.xaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14183,19 +14183,19 @@
1418314183
<TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,0,0,2" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
1418414184
<TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,2,0,0" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
1418514185
<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Row="1" Height="2" VerticalAlignment="center" Margin="9,0">
14186-
<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
14186+
<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden" Margin="-9,0,0,0">
1418714187
<Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Height="2" />
1418814188
</Canvas>
1418914189
</Border>
14190-
<Track Margin="9,0" x:Name="PART_Track" Grid.Row="1">
14190+
<Track x:Name="PART_Track" Grid.Row="1">
1419114191
<Track.DecreaseRepeatButton>
14192-
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
14192+
<RepeatButton Margin="9,0,0,0" Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
1419314193
</Track.DecreaseRepeatButton>
1419414194
<Track.IncreaseRepeatButton>
14195-
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
14195+
<RepeatButton Margin="0,0,9,0" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
1419614196
</Track.IncreaseRepeatButton>
1419714197
<Track.Thumb>
14198-
<Thumb ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" VerticalAlignment="Center" />
14198+
<Thumb ClipToBounds="False" Width="18" Margin="0" Height="18" x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" VerticalAlignment="Center" />
1419914199
</Track.Thumb>
1420014200
</Track>
1420114201
</Grid>
@@ -14239,19 +14239,19 @@
1423914239
<TickBar x:Name="LeftTick" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4" />
1424014240
<TickBar x:Name="RightTick" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4" />
1424114241
<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Column="1" HorizontalAlignment="center" Margin="0,9" Width="2">
14242-
<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
14242+
<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden" Margin="0,-9,0,0">
1424314243
<Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Width="2" />
1424414244
</Canvas>
1424514245
</Border>
14246-
<Track Margin="0,9" x:Name="PART_Track" Grid.Column="1">
14246+
<Track x:Name="PART_Track" Grid.Column="1">
1424714247
<Track.DecreaseRepeatButton>
14248-
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
14248+
<RepeatButton Margin="0,9,0,0" Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
1424914249
</Track.DecreaseRepeatButton>
1425014250
<Track.IncreaseRepeatButton>
14251-
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
14251+
<RepeatButton Margin="0,0,0,9" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
1425214252
</Track.IncreaseRepeatButton>
1425314253
<Track.Thumb>
14254-
<Thumb Margin="0,-9" x:Name="Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" HorizontalAlignment="Center" Width="18" />
14254+
<Thumb Margin="0" x:Name="Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" HorizontalAlignment="Center" Width="18" />
1425514255
</Track.Thumb>
1425614256
</Track>
1425714257
</Grid>

0 commit comments

Comments
 (0)