From 307150eeb19e78b67cd034c547c262693b739e23 Mon Sep 17 00:00:00 2001
From: Mahdi Hosseini <mahdidvb72@gmail.com>
Date: Fri, 12 Mar 2021 18:52:52 +0330
Subject: [PATCH 1/3] Update ColorPicker.cs

---
 .../Controls/ColorPicker/ColorPicker.cs       | 41 ++++++++++++++-----
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
index f8348369..30974f1b 100644
--- a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
+++ b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
@@ -178,20 +178,30 @@ namespace HandyControl.Controls
 
         #region Public Events
 
+        public static readonly RoutedEvent SelectedColorChangedEvent =
+            EventManager.RegisterRoutedEvent("SelectedColorChanged", RoutingStrategy.Bubble,
+                typeof(EventHandler<FunctionEventArgs<Color>>), typeof(ColorPicker));
+
+        public event EventHandler<FunctionEventArgs<Color>> SelectedColorChanged
+        {
+            add => AddHandler(SelectedColorChangedEvent, value);
+            remove => RemoveHandler(SelectedColorChangedEvent, value);
+        }
+
         /// <summary>
         ///     颜色改变事件
         /// </summary>
-        public static readonly RoutedEvent SelectedColorChangedEvent =
-            EventManager.RegisterRoutedEvent("SelectedColorChanged", RoutingStrategy.Bubble,
+        public static readonly RoutedEvent ConfirmedEvent =
+            EventManager.RegisterRoutedEvent("Confirmed", RoutingStrategy.Bubble,
                 typeof(EventHandler<FunctionEventArgs<Color>>), typeof(ColorPicker));
 
         /// <summary>
         ///     颜色改变事件
         /// </summary>
-        public event EventHandler<FunctionEventArgs<Color>> SelectedColorChanged
+        public event EventHandler<FunctionEventArgs<Color>> Confirmed
         {
-            add => AddHandler(SelectedColorChangedEvent, value);
-            remove => RemoveHandler(SelectedColorChangedEvent, value);
+            add => AddHandler(ConfirmedEvent, value);
+            remove => RemoveHandler(ConfirmedEvent, value);
         }
 
         /// <summary>
@@ -268,6 +278,10 @@ namespace HandyControl.Controls
                     }
                     ctl.UpdateStatus(v.Color);
                     ctl.SelectedBrushWithoutOpacity = new SolidColorBrush(Color.FromRgb(v.Color.R, v.Color.G, v.Color.B));
+                    ctl.RaiseEvent(new FunctionEventArgs<Color>(SelectedColorChangedEvent, ctl)
+                    {
+                        Info = v.Color
+                    });
                 }));
 
         /// <summary>
@@ -361,6 +375,8 @@ namespace HandyControl.Controls
                     _isLoaded = true;
                 }
             };
+
+            cPicker = this;
         }
 
         public override void OnApplyTemplate()
@@ -695,10 +711,14 @@ namespace HandyControl.Controls
         }
 
         private void ButtonConfirm_OnClick(object sender, RoutedEventArgs e)
-            => RaiseEvent(new FunctionEventArgs<Color>(SelectedColorChangedEvent, this)
-            {
-                Info = SelectedBrush.Color
-            });
+        {
+            RaiseEvent(new FunctionEventArgs<Color>(ConfirmedEvent, this)
+               {
+                   Info = SelectedBrush.Color
+               });
+
+            RaiseEvent(new RoutedEventArgs(CanceledEvent));
+        }
 
         private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => RaiseEvent(new RoutedEventArgs(CanceledEvent));
 
@@ -731,6 +751,5 @@ namespace HandyControl.Controls
         }
 
         public bool CanDispose { get; } = true;
-
     }
 }

From 4a7f860b326e73485a0c3198e461bff00d495b3b Mon Sep 17 00:00:00 2001
From: Mahdi Hosseini <mahdidvb72@gmail.com>
Date: Fri, 12 Mar 2021 18:56:39 +0330
Subject: [PATCH 2/3] Update ColorPicker.cs

---
 .../HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
index 30974f1b..e5f1db23 100644
--- a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
+++ b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
@@ -375,8 +375,6 @@ namespace HandyControl.Controls
                     _isLoaded = true;
                 }
             };
-
-            cPicker = this;
         }
 
         public override void OnApplyTemplate()

From e343ca64b410e3b5f8069fa949b0db0bb232935c Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 23 Jun 2021 21:41:41 +0800
Subject: [PATCH 3/3] Update ColorPicker.cs

---
 .../Controls/ColorPicker/ColorPicker.cs                | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
index e5f1db23..61bf4bb1 100644
--- a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
+++ b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
@@ -711,11 +711,9 @@ namespace HandyControl.Controls
         private void ButtonConfirm_OnClick(object sender, RoutedEventArgs e)
         {
             RaiseEvent(new FunctionEventArgs<Color>(ConfirmedEvent, this)
-               {
-                   Info = SelectedBrush.Color
-               });
-
-            RaiseEvent(new RoutedEventArgs(CanceledEvent));
+            {
+                Info = SelectedBrush.Color
+            });
         }
 
         private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => RaiseEvent(new RoutedEventArgs(CanceledEvent));