ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "add another resizing part that I think is a bad idea" 

This reverts commit 49b6a35dfe.
This commit is contained in:
zeromus 2020-04-23 21:20:38 -04:00
parent 8b7f7fe79b
commit 3d3348d365
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -2041,7 +2041,7 @@ namespace BizHawk.Client.EmuHawk
private void NDSSettingsMenuItem_Click(object sender, EventArgs e)
{
GenericCoreConfig.DoDialog(this, "NDS Settings", false, true);
MaybeFrameBufferResized();
FrameBufferResized();
}
private void NDSSyncSettingsMenuItem_Click(object sender, EventArgs e)

20
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -810,8 +810,6 @@ namespace BizHawk.Client.EmuHawk
private InputManager InputManager => Global.InputManager;
private IVideoProvider _currentVideoProvider = NullVideo.Instance;
int _currentVideoProvider_last_width = -1;
int _currentVideoProvider_last_height = -1;
private ISoundProvider _currentSoundProvider = new NullSound(44100 / 60); // Reasonable default until we have a core instance
@ -1086,26 +1084,8 @@ namespace BizHawk.Client.EmuHawk
AddOnScreenMessage($"{fi.Name} saved.");
}
/// <summary>
/// This is a separate function because sometimes we may knowingly want to force the layout to recalculate
/// When youre not sure, use this
/// </summary>
public void MaybeFrameBufferResized()
{
if (_currentVideoProvider_last_width == _currentVideoProvider.BufferWidth
&& _currentVideoProvider_last_height == _currentVideoProvider.BufferHeight)
return;
FrameBufferResized();
}
/// <summary>
/// Forces the window layout to recalculate
/// </summary>
public void FrameBufferResized()
{
_currentVideoProvider_last_width = _currentVideoProvider.BufferWidth;
_currentVideoProvider_last_height = _currentVideoProvider.BufferHeight;
// run this entire thing exactly twice, since the first resize may adjust the menu stacking
for (int i = 0; i < 2; i++)
{