From 98aef2a7ee630b33ecdb2395f3631db22e112f37 Mon Sep 17 00:00:00 2001 From: Pavel Kovalenko Date: Mon, 3 Nov 2014 19:28:00 +0300 Subject: [PATCH] Remove deprecated field. --- .../Controls/ColorPicker/ColorPicker.cs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/editors/xrSdkControls/Controls/ColorPicker/ColorPicker.cs b/src/editors/xrSdkControls/Controls/ColorPicker/ColorPicker.cs index 74f1aa4fff7..b6d81a13431 100644 --- a/src/editors/xrSdkControls/Controls/ColorPicker/ColorPicker.cs +++ b/src/editors/xrSdkControls/Controls/ColorPicker/ColorPicker.cs @@ -9,7 +9,6 @@ public sealed partial class ColorPicker : UserControl { public delegate void ColorChangedEventHandler(object sender, Color color); - private Color color; private bool hexadecimal; private bool ignoreOnChanged = false; private bool alphaEnabled = true; @@ -24,18 +23,18 @@ public ColorPicker() public Color Value { - get { return color; } + get { return pbColor.ColorSample; } set { - if (color == value) + if (pbColor.ColorSample == value) return; - color = value; ignoreOnChanged = true; if (alphaEnabled) - nslAlpha.Value = color.A; - nslRed.Value = color.R; - nslGreen.Value = color.G; - nslBlue.Value = color.B; + nslAlpha.Value = value.A; + nslRed.Value = value.R; + nslGreen.Value = value.G; + nslBlue.Value = value.B; + pbColor.ColorSample = value; ignoreOnChanged = false; UpdateColor(); }