From 366e02a04497c47dbaba08580c0a3a56010ba158 Mon Sep 17 00:00:00 2001
From: brianlagunas_cp <XceedBoucherS@users.noreply.github.com>
Date: Wed, 30 Mar 2011 17:03:04 +0000
Subject: [PATCH] ColorCanvas: refactored and eliminated some redundant code.

---
 .../ColorCanvas/Implementation/ColorCanvas.cs | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs
index a1d3b5e7..8f30e843 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs
@@ -42,6 +42,7 @@ namespace Microsoft.Windows.Controls
 
         protected virtual void OnSelectedColorChanged(Color oldValue, Color newValue)
         {
+            HexadecimalString = newValue.ToString();
             UpdateRGBValues(newValue);
             UpdateColorShadeSelectorPosition(newValue);
         }
@@ -69,7 +70,7 @@ namespace Microsoft.Windows.Controls
         protected virtual void OnAChanged(byte oldValue, byte newValue)
         {
             if (!_surpressPropertyChanged)
-                UpdateRGBColor();
+                UpdateSelectedColor();
         }
 
         #endregion //A
@@ -93,7 +94,7 @@ namespace Microsoft.Windows.Controls
         protected virtual void OnRChanged(byte oldValue, byte newValue)
         {
             if (!_surpressPropertyChanged)
-                UpdateRGBColor();
+                UpdateSelectedColor();
         }
 
         #endregion //R
@@ -117,7 +118,7 @@ namespace Microsoft.Windows.Controls
         protected virtual void OnGChanged(byte oldValue, byte newValue)
         {
             if (!_surpressPropertyChanged)
-                UpdateRGBColor();
+                UpdateSelectedColor();
         }
 
         #endregion //G
@@ -141,7 +142,7 @@ namespace Microsoft.Windows.Controls
         protected virtual void OnBChanged(byte oldValue, byte newValue)
         {
             if (!_surpressPropertyChanged)
-                UpdateRGBColor();
+                UpdateSelectedColor();
         }
 
         #endregion //B
@@ -167,9 +168,7 @@ namespace Microsoft.Windows.Controls
         protected virtual void OnHexadecimalStringChanged(string oldValue, string newValue)
         {
             if (!SelectedColor.ToString().Equals(newValue))
-            {
-                SetSelectedColorAndPositionSelector((Color)ColorConverter.ConvertFromString(newValue));
-            }
+                UpdateSelectedColor((Color)ColorConverter.ConvertFromString(newValue));
         }
 
         #endregion //HexadecimalString
@@ -269,11 +268,9 @@ namespace Microsoft.Windows.Controls
 
         #region Methods
 
-        private void UpdateRGBColor()
+        private void UpdateSelectedColor()
         {
             SelectedColor = Color.FromArgb(A, R, G, B);
-            UpdateColorShadeSelectorPosition(SelectedColor);
-            HexadecimalString = SelectedColor.ToString();
         }
 
         private void UpdateSelectedColor(Color color)
@@ -293,13 +290,6 @@ namespace Microsoft.Windows.Controls
             _surpressPropertyChanged = false;
         }
 
-        private void SetSelectedColorAndPositionSelector(Color color)
-        {
-            UpdateSelectedColor(color);
-            UpdateRGBValues(color);
-            UpdateColorShadeSelectorPosition(color);
-        }
-
         private void UpdateColorShadeSelectorPositionAndCalculateColor(Point p, bool calculateColor)
         {
             if (p.Y < 0)