Browse Source

ColorCanvas: fixed bug I just introduced.

import/raw
brianlagunas_cp 16 years ago
parent
commit
ded13cf17f
  1. 2
      Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs
  2. 2
      Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml

2
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); 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; _spectrumSlider.Value = hsv.H;
Point p = new Point(hsv.S, 1 - hsv.V); Point p = new Point(hsv.S, 1 - hsv.V);

2
Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml

@ -317,7 +317,7 @@
<Setter Property="IsSnapToTickEnabled" Value="True" /> <Setter Property="IsSnapToTickEnabled" Value="True" />
<Setter Property="IsDirectionReversed" Value="False" /> <Setter Property="IsDirectionReversed" Value="False" />
<Setter Property="IsMoveToPointEnabled" Value="True" /> <Setter Property="IsMoveToPointEnabled" Value="True" />
<Setter Property="Value" Value="360" /> <Setter Property="Value" Value="0" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type local:ColorSpectrumSlider}"> <ControlTemplate TargetType="{x:Type local:ColorSpectrumSlider}">

Loading…
Cancel
Save