Skip to content

Commit a3bf347

Browse files
kalimagYoshiRulz
authored andcommitted
Defer main window resize while minimized/maximized
1 parent 2e4d2ce commit a3bf347

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,6 +1585,11 @@ private void MainForm_Enter(object sender, EventArgs e)
15851585
private void MainForm_Resize(object sender, EventArgs e)
15861586
{
15871587
_presentationPanel.Resized = true;
1588+
if (_framebufferResizedPending && WindowState is FormWindowState.Normal)
1589+
{
1590+
_framebufferResizedPending = false;
1591+
FrameBufferResized();
1592+
}
15881593
}
15891594

15901595
private void MainForm_Shown(object sender, EventArgs e)

src/BizHawk.Client.EmuHawk/MainForm.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1390,6 +1390,12 @@ public void TakeScreenshot(string path)
13901390

13911391
public void FrameBufferResized(bool forceWindowResize = false)
13921392
{
1393+
if (WindowState is not FormWindowState.Normal)
1394+
{
1395+
// Wait until no longer maximized/minimized to get correct size/location values
1396+
_framebufferResizedPending = true;
1397+
return;
1398+
}
13931399
if (!Config.ResizeWithFramebuffer && !forceWindowResize)
13941400
{
13951401
return;
@@ -1692,6 +1698,7 @@ public bool RunLibretroCoreChooser()
16921698
private bool _inFullscreen;
16931699
private Point _windowedLocation;
16941700
private bool _needsFullscreenOnLoad;
1701+
private bool _framebufferResizedPending;
16951702

16961703
private int _lastOpenRomFilter;
16971704

0 commit comments

Comments
 (0)