Browse Source

ColorPicker: fixed null expcetion when re-templating in Blend

pull/1645/head
brianlagunas_cp 15 years ago
parent
commit
74f16932d3
  1. 16
      ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs

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

@ -194,16 +194,32 @@ namespace Microsoft.Windows.Controls
{ {
base.OnApplyTemplate(); base.OnApplyTemplate();
if (_colorShadingCanvas != null)
{
_colorShadingCanvas.MouseLeftButtonDown -= ColorShadingCanvas_MouseLeftButtonDown;
_colorShadingCanvas.MouseLeftButtonUp -= ColorShadingCanvas_MouseLeftButtonUp;
_colorShadingCanvas.MouseMove -= ColorShadingCanvas_MouseMove;
_colorShadingCanvas.SizeChanged -= ColorShadingCanvas_SizeChanged;
}
_colorShadingCanvas = (Canvas)GetTemplateChild("PART_ColorShadingCanvas"); _colorShadingCanvas = (Canvas)GetTemplateChild("PART_ColorShadingCanvas");
if (_colorShadingCanvas != null)
{
_colorShadingCanvas.MouseLeftButtonDown += ColorShadingCanvas_MouseLeftButtonDown; _colorShadingCanvas.MouseLeftButtonDown += ColorShadingCanvas_MouseLeftButtonDown;
_colorShadingCanvas.MouseLeftButtonUp += ColorShadingCanvas_MouseLeftButtonUp; _colorShadingCanvas.MouseLeftButtonUp += ColorShadingCanvas_MouseLeftButtonUp;
_colorShadingCanvas.MouseMove += ColorShadingCanvas_MouseMove; _colorShadingCanvas.MouseMove += ColorShadingCanvas_MouseMove;
_colorShadingCanvas.SizeChanged += ColorShadingCanvas_SizeChanged; _colorShadingCanvas.SizeChanged += ColorShadingCanvas_SizeChanged;
}
_colorShadeSelector = (Canvas)GetTemplateChild("PART_ColorShadeSelector"); _colorShadeSelector = (Canvas)GetTemplateChild("PART_ColorShadeSelector");
if (_colorShadeSelector != null)
_colorShadeSelector.RenderTransform = _colorShadeSelectorTransform; _colorShadeSelector.RenderTransform = _colorShadeSelectorTransform;
if (_spectrumSlider != null)
_spectrumSlider.ValueChanged -= SpectrumSlider_ValueChanged;
_spectrumSlider = (ColorSpectrumSlider)GetTemplateChild("PART_SpectrumSlider"); _spectrumSlider = (ColorSpectrumSlider)GetTemplateChild("PART_SpectrumSlider");
if (_spectrumSlider != null)
_spectrumSlider.ValueChanged += SpectrumSlider_ValueChanged; _spectrumSlider.ValueChanged += SpectrumSlider_ValueChanged;
UpdateRGBValues(SelectedColor); UpdateRGBValues(SelectedColor);

Loading…
Cancel
Save