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

master v2.2.0-beta
Nathan Crawford 2016-04-04 22:51:35 -04:00
rodzic 2d78fbc5b5
commit 9c44d3ecf6
2 zmienionych plików z 17 dodań i 16 usunięć

Wyświetl plik

@ -56,7 +56,7 @@ namespace embroideryReader
args = Environment.GetCommandLineArgs();
}
private void checkSettings()
private void loadSettings(bool reload)
{
if (settings.backgroundColorEnabled)
{
@ -66,16 +66,19 @@ namespace embroideryReader
{
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 @@ namespace embroideryReader
this.Text = APP_TITLE;
// Load and check settings
checkSettings();
loadSettings(false);
// Load translation
loadTranslatedStrings(settings.translation);
@ -510,7 +513,8 @@ namespace embroideryReader
if (tempForm.ShowDialog() == DialogResult.OK)
{
settings = tempForm.settingsToModify;
checkSettings();
loadSettings(true);
updateDesignImage();
}
loadTranslatedStrings(settings.translation);
}

Wyświetl plik

@ -70,10 +70,7 @@ namespace embroideryReader
chkDrawGrid.Checked = settings.transparencyGridEnabled;
gridSize = settings.transparencyGridSize;
txtGridSize.Text = gridSize.ToString();
if(chkDrawGrid.Checked)
{
transparencyGridColor = settings.transparencyGridColor;
}
transparencyGridColor = settings.transparencyGridColor;
updateGridColorControls();
}
}