fixed window always increasing + maximized being weird on game launch

pull/11/head
Miepee 6 years ago
parent 8633168a86
commit f660257385

@ -360,6 +360,9 @@ namespace AM2RLauncher
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
trayIndicator.Visible = true; trayIndicator.Visible = true;
WindowState windowStateBeforeLaunching = this.WindowState;
if (windowStateBeforeLaunching == WindowState.Maximized)
this.WindowState = WindowState.Normal;
Minimize(); Minimize();
await Task.Run(() => RunGame()); await Task.Run(() => RunGame());
@ -368,6 +371,8 @@ namespace AM2RLauncher
trayIndicator.Visible = false; trayIndicator.Visible = false;
Show(); Show();
BringToFront(); BringToFront();
if (windowStateBeforeLaunching == WindowState.Maximized)
Maximize();
SetPlayButtonState(UpdateState.Play); SetPlayButtonState(UpdateState.Play);
@ -964,8 +969,8 @@ namespace AM2RLauncher
{ {
log.Info("Attempting to close MainForm!"); log.Info("Attempting to close MainForm!");
CrossPlatformOperations.WriteToConfig("Width", Size.Width); CrossPlatformOperations.WriteToConfig("Width", ClientSize.Width);
CrossPlatformOperations.WriteToConfig("Height", Size.Height); CrossPlatformOperations.WriteToConfig("Height", ClientSize.Height);
CrossPlatformOperations.WriteToConfig("IsMaximized", (this.WindowState == WindowState.Maximized)); CrossPlatformOperations.WriteToConfig("IsMaximized", (this.WindowState == WindowState.Maximized));
if (updateState == UpdateState.Downloading) if (updateState == UpdateState.Downloading)

Loading…
Cancel
Save