Browse Source

ColorCanvas: applied patch 8849.

pull/1645/head
brianlagunas_cp 15 years ago
parent
commit
bfa3ecb9a6
  1. 8
      ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs

8
ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs

@ -193,6 +193,7 @@ namespace Microsoft.Windows.Controls
_colorShadingCanvas = (Canvas)GetTemplateChild("PART_ColorShadingCanvas"); _colorShadingCanvas = (Canvas)GetTemplateChild("PART_ColorShadingCanvas");
_colorShadingCanvas.MouseLeftButtonDown += ColorShadingCanvas_MouseLeftButtonDown; _colorShadingCanvas.MouseLeftButtonDown += ColorShadingCanvas_MouseLeftButtonDown;
_colorShadingCanvas.MouseLeftButtonUp += ColorShadingCanvas_MouseLeftButtonUp;
_colorShadingCanvas.MouseMove += ColorShadingCanvas_MouseMove; _colorShadingCanvas.MouseMove += ColorShadingCanvas_MouseMove;
_colorShadingCanvas.SizeChanged += ColorShadingCanvas_SizeChanged; _colorShadingCanvas.SizeChanged += ColorShadingCanvas_SizeChanged;
@ -224,6 +225,12 @@ namespace Microsoft.Windows.Controls
{ {
Point p = e.GetPosition(_colorShadingCanvas); Point p = e.GetPosition(_colorShadingCanvas);
UpdateColorShadeSelectorPositionAndCalculateColor(p, true); UpdateColorShadeSelectorPositionAndCalculateColor(p, true);
_colorShadingCanvas.CaptureMouse();
}
void ColorShadingCanvas_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
_colorShadingCanvas.ReleaseMouseCapture();
} }
void ColorShadingCanvas_MouseMove(object sender, MouseEventArgs e) void ColorShadingCanvas_MouseMove(object sender, MouseEventArgs e)
@ -266,6 +273,7 @@ namespace Microsoft.Windows.Controls
{ {
SelectedColor = Color.FromArgb(A, R, G, B); SelectedColor = Color.FromArgb(A, R, G, B);
UpdateColorShadeSelectorPosition(SelectedColor); UpdateColorShadeSelectorPosition(SelectedColor);
HexadecimalString = SelectedColor.ToString();
} }
private void UpdateSelectedColor(Color color) private void UpdateSelectedColor(Color color)

Loading…
Cancel
Save