Properly load and save background grid color when background grid is …

…disabled
njcrawford · Apr 5, 2016 · 9c44d3e · 9c44d3e
1 parent 2d78fbc
commit 9c44d3e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/embroideryReader/frmMain.cs b/embroideryReader/frmMain.cs
@@ -56,7 +56,7 @@ public frmMain()
             args = Environment.GetCommandLineArgs();
         }
 
-        private void checkSettings()
+        private void loadSettings(bool reload)
         {
             if (settings.backgroundColorEnabled)
             {
@@ -66,16 +66,19 @@ private void checkSettings()
             {
                 panel2.BackColor = Color.FromKnownColor(KnownColor.Control);
             }
-            if (settings.windowMaximized)
+            if (!reload)
             {
-                // Check maximized first
-                this.WindowState = FormWindowState.Maximized;
-            }
-            else
-            {
-                // Not maximized, restore last saved window size
-                this.Width = settings.windowWidth;
-                this.Height = settings.windowHeight;
+                if (settings.windowMaximized)
+                {
+                    // Check maximized first
+                    this.WindowState = FormWindowState.Maximized;
+                }
+                else
+                {
+                    // Not maximized, restore last saved window size
+                    this.Width = settings.windowWidth;
+                    this.Height = settings.windowHeight;
+                }
             }
             setDesignScaleSetting(1.0f, settings.AutoScaleDesign, false);
         }
@@ -86,7 +89,7 @@ private void Form1_Load(object sender, EventArgs e)
             this.Text = APP_TITLE;
 
             // Load and check settings
-            checkSettings();
+            loadSettings(false);
 
             // Load translation
             loadTranslatedStrings(settings.translation);
@@ -510,7 +513,8 @@ private void preferencesToolStripMenuItem_Click(object sender, EventArgs e)
             if (tempForm.ShowDialog() == DialogResult.OK)
             {
                 settings = tempForm.settingsToModify;
-                checkSettings();
+                loadSettings(true);
+                updateDesignImage();
             }
             loadTranslatedStrings(settings.translation);
         }

diff --git a/embroideryReader/frmSettingsDialog.cs b/embroideryReader/frmSettingsDialog.cs
@@ -70,10 +70,7 @@ public EmbroideryReaderSettings settingsToModify
                 chkDrawGrid.Checked = settings.transparencyGridEnabled;
                 gridSize = settings.transparencyGridSize;
                 txtGridSize.Text = gridSize.ToString();
-                if(chkDrawGrid.Checked)
-                {
-                    transparencyGridColor = settings.transparencyGridColor;
-                }
+                transparencyGridColor = settings.transparencyGridColor;
                 updateGridColorControls();
             }
         }