Add AlphaEnabled property for ColorPicker control.

OpenXRay · Oct 19, 2014 · 600181a · 600181a
1 parent d0c105f
commit 600181a
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/src/editors/xrSdkControls/Controls/ColorPicker/ColorPicker.cs b/src/editors/xrSdkControls/Controls/ColorPicker/ColorPicker.cs
@@ -12,6 +12,7 @@ public sealed partial class ColorPicker : UserControl
         private Color color;
         private bool hexadecimal;
         private bool ignoreOnChanged = false;
+        private bool alphaEnabled = true;
 
         public ColorPicker()
         {
@@ -29,7 +30,8 @@ public Color Value
                     return;
                 color = value;
                 ignoreOnChanged = true;
-                nslAlpha.Value = color.A;
+                if (alphaEnabled)
+                    nslAlpha.Value = color.A;
                 nslRed.Value = color.R;
                 nslGreen.Value = color.G;
                 nslBlue.Value = color.B;
@@ -43,6 +45,23 @@ public Color Value
         public byte Blue { get; private set; }
         public byte Alpha { get; private set; }
 
+        public bool AlphaEnabled
+        {
+            get { return alphaEnabled; }
+            set
+            {
+                if (alphaEnabled == value)
+                    return;
+                alphaEnabled = value;
+                ignoreOnChanged = true;
+                nslAlpha.Value = nslAlpha.Maximum;
+                ignoreOnChanged = false;
+                UpdateColor();
+                lAlpha.Enabled = alphaEnabled;
+                nslAlpha.Enabled = alphaEnabled;
+            }
+        }
+
         public bool Hexadecimal
         {
             get { return hexadecimal; }