Fix ColorPicker Value setter.

OpenXRay · Oct 19, 2014 · d0c105f · d0c105f
1 parent 6151bb2
commit d0c105f
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/src/editors/xrSdkControls/Controls/ColorPicker/ColorPicker.cs b/src/editors/xrSdkControls/Controls/ColorPicker/ColorPicker.cs
@@ -11,6 +11,7 @@ public sealed partial class ColorPicker : UserControl
 
         private Color color;
         private bool hexadecimal;
+        private bool ignoreOnChanged = false;
 
         public ColorPicker()
         {
@@ -24,7 +25,15 @@ public Color Value
             get { return color; }
             set
             {
+                if (color == value)
+                    return;
                 color = value;
+                ignoreOnChanged = true;
+                nslAlpha.Value = color.A;
+                nslRed.Value = color.R;
+                nslGreen.Value = color.G;
+                nslBlue.Value = color.B;
+                ignoreOnChanged = false;
                 UpdateColor();
             }
         }
@@ -60,9 +69,17 @@ protected override void OnLoad(EventArgs e)
             chkHexadecimal.CheckedChanged += (obj, args) => Hexadecimal = chkHexadecimal.Checked;
             UpdateColor();
         }
-
+
+        private void OnColorChanged()
+        {
+            if (!ignoreOnChanged && ColorChanged != null)
+                ColorChanged(this, Value);
+        }
+
         private void UpdateColor()
         {
+            if (ignoreOnChanged)
+                return;
             var newColor = Color.FromArgb(
                 Convert.ToInt32(nslAlpha.Value),
                 Convert.ToInt32(nslRed.Value),
@@ -71,8 +88,7 @@ private void UpdateColor()
             if (pbColor.ColorSample == newColor)
                 return;
             pbColor.ColorSample = newColor;
-            if (ColorChanged != null)
-                ColorChanged(this, Value);
+            OnColorChanged();
         }
     }
 }