Skip to content

Commit

Permalink
Remove deprecated field.
Browse files Browse the repository at this point in the history
  • Loading branch information
Pavel Kovalenko committed Nov 3, 2014
1 parent efeef87 commit 98aef2a
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions src/editors/xrSdkControls/Controls/ColorPicker/ColorPicker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
}
Expand Down

0 comments on commit 98aef2a

Please sign in to comment.