From ded13cf17fcee0ee76edd77b8727d9eadcca71d3 Mon Sep 17 00:00:00 2001 From: brianlagunas_cp Date: Wed, 30 Mar 2011 17:22:19 +0000 Subject: [PATCH] ColorCanvas: fixed bug I just introduced. --- .../ColorCanvas/Implementation/ColorCanvas.cs | 2 +- .../Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs b/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs index 9922e955..b2263ce0 100644 --- a/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs +++ b/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs @@ -325,7 +325,7 @@ namespace Microsoft.Windows.Controls HsvColor hsv = ColorUtilities.ConvertRgbToHsv(color.R, color.G, color.B); - if (color.R != color.G && color.R != color.B) + if (!(color.R == color.G && color.R == color.B)) _spectrumSlider.Value = hsv.H; Point p = new Point(hsv.S, 1 - hsv.V); diff --git a/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml b/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml index 858b0b52..6cc8d243 100644 --- a/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml +++ b/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml @@ -317,7 +317,7 @@ - +