Version bumped to v1.1.1. Exex color is now properly shown in picker …

…when the 'invert' checkbox is set
adriangl · Apr 4, 2015 · 69ab19f · 69ab19f
1 parent 1a1c7ff
commit 69ab19f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/DissDlcToolkit/Forms/MainFormExexUserControl.cs b/DissDlcToolkit/Forms/MainFormExexUserControl.cs
@@ -163,33 +163,34 @@ private void selectColorAndUpdate(Label label, TextBox textBox, bool invertColor
         {
             if (labelBoxesEnabled)
             {
-                Color backColor = openColorDialog(label.BackColor, invertColor);
+                Color backColor = openColorDialog(label.BackColor);
                 updateColorData(backColor, label, textBox, invertColor, applyAlpha);
             }
         }
 
         private void updateColorData(Color backColor, Label colorLabel, TextBox colorTextBox,
             Boolean invert, Boolean applyAlpha)
         {
-            Color colorToApply = invert ? MiscUtils.invertColor(backColor) : backColor;
+            Color colorToApply = backColor;
             if (!applyAlpha)
             {
                 colorToApply = Color.FromArgb(0xFF, colorToApply.R, colorToApply.G, colorToApply.B);
             }
+
             colorLabel.BackColor = colorToApply;
-            colorTextBox.Text = applyAlpha ? MiscUtils.argbToString(backColor) : MiscUtils.rgbToString(backColor);
+            Color colorToShowInTextBox = invert ? MiscUtils.invertColor(backColor) : backColor;
+            colorTextBox.Text = applyAlpha ? MiscUtils.argbToString(colorToShowInTextBox) : MiscUtils.rgbToString(colorToShowInTextBox);
         }
 
-        private Color openColorDialog(Color currentColor, Boolean invertColor)
+        private Color openColorDialog(Color currentColor)
         {            
             ArgbColorDialog dialog = new ArgbColorDialog();
             // Sets the initial color select to the current text color.
-            dialog.Color = invertColor ? MiscUtils.invertColor(currentColor) : currentColor;
+            dialog.Color = currentColor;
             dialog.ShowDialog();
 
             // Update the text box color
             return dialog.Color;
-
         }
 
         private void populateFields(ExexTable table)

diff --git a/DissDlcToolkit/Properties/AssemblyInfo.cs b/DissDlcToolkit/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Puede especificar todos los valores o establecer como predeterminados los números de compilación y de revisión 
 // mediante el carácter '*', como se muestra a continuación:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0")]
-[assembly: AssemblyFileVersion("1.1.0")]
+[assembly: AssemblyVersion("1.1.1")]
+[assembly: AssemblyFileVersion("1.1.1")]