Skip to content

Commit ffd27d8

Browse files
NaBianNaBian
committed
fix: fixed shake problem of CompareSlider
1 parent 8e12338 commit ffd27d8

File tree

4 files changed

+41
-94
lines changed

4 files changed

+41
-94
lines changed

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

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@
411411
<Setter Property="Template">
412412
<Setter.Value>
413413
<ControlTemplate TargetType="RepeatButton">
414-
<ContentPresenter Content="{TemplateBinding Content}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" />
414+
<ContentPresenter Content="{TemplateBinding Content}" Height="{TemplateBinding ActualHeight}" Width="{TemplateBinding ActualWidth}" />
415415
</ControlTemplate>
416416
</Setter.Value>
417417
</Setter>
@@ -1433,27 +1433,19 @@
14331433
</ControlTemplate>
14341434
<ControlTemplate x:Key="CompareSliderHorizontal" TargetType="hc:CompareSlider">
14351435
<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
1436-
<hc:CompareTrack Margin="-14,0,-15,0" x:Name="PART_Track">
1436+
<hc:CompareTrack x:Name="PART_Track">
14371437
<Track.DecreaseRepeatButton>
1438-
<RepeatButton Margin="14,0,-15,0" Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1439-
<RepeatButton.Content>
1440-
<Border HorizontalAlignment="Left" Width="{TemplateBinding Width}">
1441-
<ContentPresenter Content="{TemplateBinding TargetContent}" />
1442-
</Border>
1443-
</RepeatButton.Content>
1438+
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1439+
<ContentPresenter ContentSource="TargetContent" HorizontalAlignment="Left" Width="{TemplateBinding ActualWidth}" />
14441440
</RepeatButton>
14451441
</Track.DecreaseRepeatButton>
14461442
<Track.IncreaseRepeatButton>
1447-
<RepeatButton Margin="-15,0,15,0" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1448-
<RepeatButton.Content>
1449-
<Border HorizontalAlignment="Right" Width="{TemplateBinding ActualWidth}">
1450-
<ContentPresenter Content="{TemplateBinding SourceContent}" />
1451-
</Border>
1452-
</RepeatButton.Content>
1443+
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1444+
<ContentPresenter ContentSource="SourceContent" HorizontalAlignment="Right" Width="{TemplateBinding ActualWidth}" />
14531445
</RepeatButton>
14541446
</Track.IncreaseRepeatButton>
14551447
<Track.Thumb>
1456-
<Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbHorizontal}" Width="30" Margin="0,0,0,0" />
1448+
<Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbHorizontal}" Width="30" Margin="-15,0" />
14571449
</Track.Thumb>
14581450
</hc:CompareTrack>
14591451
</Border>
@@ -1535,27 +1527,19 @@
15351527
</ControlTemplate>
15361528
<ControlTemplate x:Key="CompareSliderVertical" TargetType="hc:CompareSlider">
15371529
<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
1538-
<hc:CompareTrack Margin="0,-14,0,-15" x:Name="PART_Track">
1530+
<hc:CompareTrack x:Name="PART_Track">
15391531
<Track.DecreaseRepeatButton>
1540-
<RepeatButton Margin="0,-15,0,15" Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1541-
<RepeatButton.Content>
1542-
<Border VerticalAlignment="Bottom" Height="{TemplateBinding Height}">
1543-
<ContentPresenter Content="{TemplateBinding TargetContent}" />
1544-
</Border>
1545-
</RepeatButton.Content>
1532+
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1533+
<ContentPresenter ContentSource="TargetContent" VerticalAlignment="Bottom" Height="{TemplateBinding ActualHeight}" />
15461534
</RepeatButton>
15471535
</Track.DecreaseRepeatButton>
15481536
<Track.IncreaseRepeatButton>
1549-
<RepeatButton Margin="0,14,0,-15" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1550-
<RepeatButton.Content>
1551-
<Border VerticalAlignment="Top" Height="{TemplateBinding Height}">
1552-
<ContentPresenter Content="{TemplateBinding SourceContent}" />
1553-
</Border>
1554-
</RepeatButton.Content>
1537+
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1538+
<ContentPresenter ContentSource="SourceContent" VerticalAlignment="Top" Height="{TemplateBinding ActualHeight}" />
15551539
</RepeatButton>
15561540
</Track.IncreaseRepeatButton>
15571541
<Track.Thumb>
1558-
<Thumb x:Name="Thumb" Focusable="False" Height="30" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbVertical}" VerticalAlignment="Top" />
1542+
<Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbVertical}" Height="30" Margin="0,-15" />
15591543
</Track.Thumb>
15601544
</hc:CompareTrack>
15611545
</Border>

‎src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@
4444
<Path Data="{StaticResource EmailGeometry}" Fill="{DynamicResource PrimaryBrush}"/>
4545
</MenuItem.Icon>
4646
</MenuItem>
47-
<MenuItem Header="{ex:Lang Key={x:Static langs:LangKeys.Chatroom}}">
48-
<MenuItem.Icon>
49-
<Path Data="{StaticResource GitterGeometry}" Fill="#e52e64"/>
50-
</MenuItem.Icon>
51-
</MenuItem>
5247
<MenuItem Header="{ex:Lang Key={x:Static langs:LangKeys.Blog}}">
5348
<MenuItem.Icon>
5449
<Path Data="{StaticResource CnblogsGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
@@ -61,7 +56,7 @@
6156
</ToolBarTray>
6257
<ToolBarTray Orientation="Vertical" Margin="0,16,0,0">
6358
<ToolBar Padding="6" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}">
64-
<CheckBox IsChecked="True" Margin="0,10,0,0"/>
59+
<CheckBox IsChecked="True" Margin="0,10,0,0" HorizontalAlignment="Center"/>
6560
<Separator Margin="0,10,0,0"/>
6661
<RadioButton Margin="0,10,0,0"/>
6762
<StackPanel>
@@ -72,7 +67,7 @@
7267
<Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}" Margin="0,10,0,0" Style="{StaticResource ButtonPrimary}"/>
7368
</ToolBar>
7469
<ToolBar Band="1" Padding="6" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}">
75-
<CheckBox IsChecked="True" Margin="0,10,0,0"/>
70+
<CheckBox IsChecked="True" Margin="0,10,0,0" HorizontalAlignment="Center"/>
7671
<Separator Margin="0,10,0,0"/>
7772
<RadioButton Margin="0,10,0,0"/>
7873
<StackPanel>

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

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@
331331
<Setter Property="Template">
332332
<Setter.Value>
333333
<ControlTemplate TargetType="RepeatButton">
334-
<ContentPresenter Content="{TemplateBinding Content}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}"/>
334+
<ContentPresenter Content="{TemplateBinding Content}" Height="{TemplateBinding ActualHeight}" Width="{TemplateBinding ActualWidth}"/>
335335
</ControlTemplate>
336336
</Setter.Value>
337337
</Setter>
@@ -412,27 +412,19 @@
412412

413413
<ControlTemplate x:Key="CompareSliderHorizontal" TargetType="hc:CompareSlider">
414414
<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
415-
<hc:CompareTrack Margin="-14,0,-15,0" x:Name="PART_Track">
415+
<hc:CompareTrack x:Name="PART_Track">
416416
<Track.DecreaseRepeatButton>
417-
<RepeatButton Margin="14,0,-15,0" Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
418-
<RepeatButton.Content>
419-
<Border HorizontalAlignment="Left" Width="{TemplateBinding Width}">
420-
<ContentPresenter Content="{TemplateBinding TargetContent}"/>
421-
</Border>
422-
</RepeatButton.Content>
417+
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
418+
<ContentPresenter ContentSource="TargetContent" HorizontalAlignment="Left" Width="{TemplateBinding ActualWidth}"/>
423419
</RepeatButton>
424420
</Track.DecreaseRepeatButton>
425421
<Track.IncreaseRepeatButton>
426-
<RepeatButton Margin="-15,0,15,0" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
427-
<RepeatButton.Content>
428-
<Border HorizontalAlignment="Right" Width="{TemplateBinding ActualWidth}">
429-
<ContentPresenter Content="{TemplateBinding SourceContent}"/>
430-
</Border>
431-
</RepeatButton.Content>
422+
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
423+
<ContentPresenter ContentSource="SourceContent" HorizontalAlignment="Right" Width="{TemplateBinding ActualWidth}"/>
432424
</RepeatButton>
433425
</Track.IncreaseRepeatButton>
434426
<Track.Thumb>
435-
<Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbHorizontal}" Width="30" Margin="0,0,0,0"/>
427+
<Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbHorizontal}" Width="30" Margin="-15,0"/>
436428
</Track.Thumb>
437429
</hc:CompareTrack>
438430
</Border>
@@ -516,27 +508,19 @@
516508

517509
<ControlTemplate x:Key="CompareSliderVertical" TargetType="hc:CompareSlider">
518510
<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
519-
<hc:CompareTrack Margin="0,-14,0,-15" x:Name="PART_Track">
511+
<hc:CompareTrack x:Name="PART_Track">
520512
<Track.DecreaseRepeatButton>
521-
<RepeatButton Margin="0,-15,0,15" Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
522-
<RepeatButton.Content>
523-
<Border VerticalAlignment="Bottom" Height="{TemplateBinding Height}">
524-
<ContentPresenter Content="{TemplateBinding TargetContent}"/>
525-
</Border>
526-
</RepeatButton.Content>
513+
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
514+
<ContentPresenter ContentSource="TargetContent" VerticalAlignment="Bottom" Height="{TemplateBinding ActualHeight}"/>
527515
</RepeatButton>
528516
</Track.DecreaseRepeatButton>
529517
<Track.IncreaseRepeatButton>
530-
<RepeatButton Margin="0,14,0,-15" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
531-
<RepeatButton.Content>
532-
<Border VerticalAlignment="Top" Height="{TemplateBinding Height}">
533-
<ContentPresenter Content="{TemplateBinding SourceContent}"/>
534-
</Border>
535-
</RepeatButton.Content>
518+
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
519+
<ContentPresenter ContentSource="SourceContent" VerticalAlignment="Top" Height="{TemplateBinding ActualHeight}"/>
536520
</RepeatButton>
537521
</Track.IncreaseRepeatButton>
538522
<Track.Thumb>
539-
<Thumb x:Name="Thumb" Focusable="False" Height="30" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbVertical}" VerticalAlignment="Top"/>
523+
<Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbVertical}" Height="30" Margin="0,-15" />
540524
</Track.Thumb>
541525
</hc:CompareTrack>
542526
</Border>

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

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@
411411
<Setter Property="Template">
412412
<Setter.Value>
413413
<ControlTemplate TargetType="RepeatButton">
414-
<ContentPresenter Content="{TemplateBinding Content}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" />
414+
<ContentPresenter Content="{TemplateBinding Content}" Height="{TemplateBinding ActualHeight}" Width="{TemplateBinding ActualWidth}" />
415415
</ControlTemplate>
416416
</Setter.Value>
417417
</Setter>
@@ -1433,27 +1433,19 @@
14331433
</ControlTemplate>
14341434
<ControlTemplate x:Key="CompareSliderHorizontal" TargetType="hc:CompareSlider">
14351435
<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
1436-
<hc:CompareTrack Margin="-14,0,-15,0" x:Name="PART_Track">
1436+
<hc:CompareTrack x:Name="PART_Track">
14371437
<Track.DecreaseRepeatButton>
1438-
<RepeatButton Margin="14,0,-15,0" Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1439-
<RepeatButton.Content>
1440-
<Border HorizontalAlignment="Left" Width="{TemplateBinding Width}">
1441-
<ContentPresenter Content="{TemplateBinding TargetContent}" />
1442-
</Border>
1443-
</RepeatButton.Content>
1438+
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1439+
<ContentPresenter ContentSource="TargetContent" HorizontalAlignment="Left" Width="{TemplateBinding ActualWidth}" />
14441440
</RepeatButton>
14451441
</Track.DecreaseRepeatButton>
14461442
<Track.IncreaseRepeatButton>
1447-
<RepeatButton Margin="-15,0,15,0" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1448-
<RepeatButton.Content>
1449-
<Border HorizontalAlignment="Right" Width="{TemplateBinding ActualWidth}">
1450-
<ContentPresenter Content="{TemplateBinding SourceContent}" />
1451-
</Border>
1452-
</RepeatButton.Content>
1443+
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1444+
<ContentPresenter ContentSource="SourceContent" HorizontalAlignment="Right" Width="{TemplateBinding ActualWidth}" />
14531445
</RepeatButton>
14541446
</Track.IncreaseRepeatButton>
14551447
<Track.Thumb>
1456-
<Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbHorizontal}" Width="30" Margin="0,0,0,0" />
1448+
<Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbHorizontal}" Width="30" Margin="-15,0" />
14571449
</Track.Thumb>
14581450
</hc:CompareTrack>
14591451
</Border>
@@ -1535,27 +1527,19 @@
15351527
</ControlTemplate>
15361528
<ControlTemplate x:Key="CompareSliderVertical" TargetType="hc:CompareSlider">
15371529
<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
1538-
<hc:CompareTrack Margin="0,-14,0,-15" x:Name="PART_Track">
1530+
<hc:CompareTrack x:Name="PART_Track">
15391531
<Track.DecreaseRepeatButton>
1540-
<RepeatButton Margin="0,-15,0,15" Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1541-
<RepeatButton.Content>
1542-
<Border VerticalAlignment="Bottom" Height="{TemplateBinding Height}">
1543-
<ContentPresenter Content="{TemplateBinding TargetContent}" />
1544-
</Border>
1545-
</RepeatButton.Content>
1532+
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1533+
<ContentPresenter ContentSource="TargetContent" VerticalAlignment="Bottom" Height="{TemplateBinding ActualHeight}" />
15461534
</RepeatButton>
15471535
</Track.DecreaseRepeatButton>
15481536
<Track.IncreaseRepeatButton>
1549-
<RepeatButton Margin="0,14,0,-15" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1550-
<RepeatButton.Content>
1551-
<Border VerticalAlignment="Top" Height="{TemplateBinding Height}">
1552-
<ContentPresenter Content="{TemplateBinding SourceContent}" />
1553-
</Border>
1554-
</RepeatButton.Content>
1537+
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
1538+
<ContentPresenter ContentSource="SourceContent" VerticalAlignment="Top" Height="{TemplateBinding ActualHeight}" />
15551539
</RepeatButton>
15561540
</Track.IncreaseRepeatButton>
15571541
<Track.Thumb>
1558-
<Thumb x:Name="Thumb" Focusable="False" Height="30" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbVertical}" VerticalAlignment="Top" />
1542+
<Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbVertical}" Height="30" Margin="0,-15" />
15591543
</Track.Thumb>
15601544
</hc:CompareTrack>
15611545
</Border>

0 commit comments

Comments
 (0)