From 453839e7637e23356d0b863af2628e2b46a3ae7c Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 20 Nov 2019 00:18:11 +0800
Subject: [PATCH] close #234

now you can customize dot by PageButtonStyle property @jingsong-liu
---
 .../Controls/Block/FloatingBlock.cs           | 11 +++-
 .../Controls/Other/Carousel.cs                | 59 ++++++++-----------
 .../Controls/Slider/PreviewSlider.cs          | 18 ++++--
 .../Themes/Styles/Carousel.xaml               | 31 +++++++++-
 4 files changed, 78 insertions(+), 41 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs b/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs
index f838f2bf..3a7287bb 100644
--- a/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs
@@ -173,9 +173,16 @@ namespace HandyControl.Controls
             storyboard.Completed += (s, e) =>
             {
                 var layer = AdornerLayer.GetAdornerLayer(element);
-                if (layer == null) return;
+                if (layer != null)
+                {
+                    layer.Remove(adorner);
+                }
+                else if (adorner.Parent is AdornerLayer parent)
+                {
+                    parent.Remove(adorner);
+                }
+
                 adorner.Child = null;
-                layer.Remove(adorner);
             };
             storyboard.Children.Add(animationX);
             storyboard.Children.Add(animationY);
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Carousel.cs b/src/Shared/HandyControl_Shared/Controls/Other/Carousel.cs
index 3492f38b..61cc89ad 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Carousel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Carousel.cs
@@ -8,7 +8,6 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Markup;
-using System.Windows.Media;
 using System.Windows.Threading;
 using HandyControl.Data;
 using HandyControl.Interactivity;
@@ -42,7 +41,7 @@ namespace HandyControl.Controls
 
         private int _pageIndex = -1;
 
-        private Button _selectedButton;
+        private RadioButton _selectedButton;
 
         private DispatcherTimer _updateTimer;
 
@@ -104,6 +103,15 @@ namespace HandyControl.Controls
             set => SetValue(IsCenterProperty, value);
         }
 
+        public static readonly DependencyProperty PageButtonStyleProperty = DependencyProperty.Register(
+            "PageButtonStyle", typeof(Style), typeof(Carousel), new PropertyMetadata(default(Style)));
+
+        public Style PageButtonStyle
+        {
+            get => (Style) GetValue(PageButtonStyleProperty);
+            set => SetValue(PageButtonStyleProperty, value);
+        }
+
         public Carousel()
         {
             CommandBindings.Add(new CommandBinding(ControlCommands.Prev, ButtonPrev_OnClick));
@@ -210,15 +218,21 @@ namespace HandyControl.Controls
             _panelPage.Children.Clear();
             for (var i = 0; i < count; i++)
             {
-                _panelPage.Children.Add(CreatePateButton());
+                _panelPage.Children.Add(new RadioButton
+                {
+                    Style = PageButtonStyle
+                });
             }
 
             if (index == -1 && count > 0) index = 0;
             if (index >= 0 && index < count)
             {
-                var button = _panelPage.Children[index];
-                button.RaiseEvent(new RoutedEventArgs(ButtonBase.ClickEvent, button));
-                UpdateItemsPosition();
+                if (_panelPage.Children[index] is RadioButton button)
+                {
+                    button.IsChecked = true;
+                    button.RaiseEvent(new RoutedEventArgs(ButtonBase.ClickEvent, button));
+                    UpdateItemsPosition();
+                }
             }
         }
 
@@ -251,40 +265,17 @@ namespace HandyControl.Controls
             UpdateItemsPosition();
         }
 
-        /// <summary>
-        ///     创建页按钮
-        /// </summary>
-        /// <returns></returns>
-        private Button CreatePateButton()
-        {
-            var button = new Button
-            {
-                Style = ResourceHelper.GetResource<Style>(ResourceToken.ButtonCustom),
-                Content = new Border
-                {
-                    Width = 10,
-                    Height = 10,
-                    CornerRadius = new CornerRadius(5),
-                    Background = Brushes.White,
-                    Margin = new Thickness(5, 0, 5, 0),
-                    BorderThickness = new Thickness(1),
-                    BorderBrush = ResourceHelper.GetResource<Brush>(ResourceToken.PrimaryBrush)
-                }
-            };
-            return button;
-        }
-
         private void ButtonPages_OnClick(object sender, RoutedEventArgs e)
         {
             if (!CheckNull()) return;
-            if (_selectedButton != null && _selectedButton.Content is Border borderOri)
-                borderOri.Background = Brushes.White;
-            _selectedButton = e.OriginalSource as Button;
-            if (_selectedButton != null && _selectedButton.Content is Border border)
-                border.Background = ResourceHelper.GetResource<Brush>(ResourceToken.PrimaryBrush);
+
+            _selectedButton = e.OriginalSource as RadioButton;
+            
             var index = _panelPage.Children.IndexOf(_selectedButton);
             if (index != -1)
+            {
                 PageIndex = index;
+            }
         }
 
         private void ButtonPrev_OnClick(object sender, RoutedEventArgs e) => PageIndex--;
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs b/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs
index e47a6416..96909766 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs
@@ -153,10 +153,20 @@ namespace HandyControl.Controls
             base.OnMouseLeave(e);
 
             var layer = AdornerLayer.GetAdornerLayer(this);
-            if (layer == null) return;
-            layer.Remove(_adorner);
-            _adorner.Child = null;
-            _adorner = null;
+            if (layer != null)
+            {
+                layer.Remove(_adorner);
+            }
+            else if (_adorner != null && _adorner.Parent is AdornerLayer parent)
+            {
+                parent.Remove(_adorner);
+            }
+
+            if (_adorner != null)
+            {
+                _adorner.Child = null;
+                _adorner = null;
+            }
         }
 
         public override void OnApplyTemplate()
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Carousel.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Carousel.xaml
index 1686a0a6..d79868a5 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Carousel.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Carousel.xaml
@@ -24,7 +24,36 @@
         <Setter Property="ItemContainerStyle" Value="{StaticResource CarouselListBoxItemStyle}"/>
     </Style>
 
+    <Style x:Key="CarouselPateButton" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
+        <Setter Property="Margin" Value="5,0"/>
+        <Setter Property="Width" Value="10"/>
+        <Setter Property="Height" Value="10"/>
+        <Setter Property="Background" Value="White"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Border CornerRadius="5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}"/>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Opacity" Value=".9"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Opacity" Value=".6"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style TargetType="controls:Carousel" BasedOn="{StaticResource CarouselListBox}">
+        <Setter Property="PageButtonStyle" Value="{StaticResource CarouselPateButton}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:Carousel">
@@ -46,7 +75,7 @@
                     </ControlTemplate.Triggers>
                     <controls:SimplePanel ClipToBounds="True">
                         <ItemsPresenter x:Name="PART_ItemsControl" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" HorizontalAlignment="Left"/>
-                        <controls:SimplePanel Name="GridTop" Opacity="0">
+                        <controls:SimplePanel x:Name="GridTop" Opacity="0">
                             <Button Command="interactivity:ControlCommands.Prev" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0" Style="{StaticResource ButtonCustom}">
                                 <Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
                                     <Path Margin="16" Fill="White" Style="{StaticResource LeftPathStyle}"/>