Main window auto-size fixes

src/BizHawk.Client.Common/config/Config.cs

@@ -142,6 +142,7 @@ public void SetWindowScaleFor(string sysID, int windowScale)
  public bool StartFullscreen { get; set; }
  public Point? MainWindowPosition { get; set; }
  public Size? MainWindowSize { get; set; }
+ public bool MainWindowMaximized { get; set; }
  public bool RunInBackground { get; set; } = true;
  public bool AcceptBackgroundInput { get; set; }
  public bool AcceptBackgroundInputControllerOnly { get; set; }

src/BizHawk.Client.EmuHawk/MainForm.Events.cs

@@ -1585,6 +1585,11 @@ private void MainForm_Enter(object sender, EventArgs e)
  private void MainForm_Resize(object sender, EventArgs e)
  {
  _presentationPanel.Resized = true;
+ if (_framebufferResizedPending && WindowState is FormWindowState.Normal)
+ {
+ _framebufferResizedPending = false;
+ FrameBufferResized();
+ }
  }
 
  private void MainForm_Shown(object sender, EventArgs e)

src/BizHawk.Client.EmuHawk/MainForm.cs

@@ -610,6 +610,11 @@ _argParser.SocketAddress is var (socketIP, socketPort)
  {
  Size = size;
  }
+
+ if (Config.MainWindowMaximized)
+ {
+ WindowState = FormWindowState.Maximized;
+ }
  }
 
  if (Config.MainFormStayOnTop) TopMost = true;
@@ -1390,6 +1395,12 @@ public void TakeScreenshot(string path)
 
  public void FrameBufferResized(bool forceWindowResize = false)
  {
+ if (WindowState is not FormWindowState.Normal)
+ {
+ // Wait until no longer maximized/minimized to get correct size/location values
+ _framebufferResizedPending = true;
+ return;
+ }
  if (!Config.ResizeWithFramebuffer && !forceWindowResize)
  {
  return;
@@ -1427,14 +1438,17 @@ public void FrameBufferResized(bool forceWindowResize = false)
  // Is window off the screen at this size?
  if (!area.Contains(Bounds))
  {
+ // At large framebuffer sizes/low screen resolutions, the window may be too large to fit the screen even at 1x scale
+ // Prioritize that the top-left of the window is on-screen so the title bar and menu stay accessible
+
  if (Bounds.Right > area.Right) // Window is off the right edge
  {
- Location = new Point(area.Right - Size.Width, Location.Y);
+ Left = Math.Max(area.Right - Size.Width, area.Left);
  }
 
  if (Bounds.Bottom > area.Bottom) // Window is off the bottom edge
  {
- Location = new Point(Location.X, area.Bottom - Size.Height);
+ Top = Math.Max(area.Bottom - Size.Height, area.Top);
  }
  }
  }
@@ -1692,6 +1706,7 @@ public bool RunLibretroCoreChooser()
  private bool _inFullscreen;
  private Point _windowedLocation;
  private bool _needsFullscreenOnLoad;
+ private bool _framebufferResizedPending;
 
  private int _lastOpenRomFilter;
 
@@ -2424,6 +2439,7 @@ private void SaveConfig(string path = "")
  Config.MainWindowPosition = Location;
  Config.MainWindowSize = Size;
  }
+ Config.MainWindowMaximized = WindowState is FormWindowState.Maximized && !_inFullscreen;
  }
  else
  {