Emulation/Mesen
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen.git synced 2025-04-02 10:52:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Video: Restore scale properly when going out of fullscreen mode + fixed issues with scale not being applied properly after filter changes in fullscreen mode

Browse source
This commit is contained in:
Souryo 2016-12-09 12:01:44 -05:00
parent 3f3b3ffb3c
commit 393126f798
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
GUI.NET/Forms/frmMain.cs
View file

@ -289,6 +289,7 @@ namespace Mesen.GUI.Forms
} else {
SetScale(1);
}
_regularScale = 1;
_needScaleUpdate = false;
}
@ -304,16 +305,23 @@ namespace Mesen.GUI.Forms
{
InteropEmu.ScreenSize size = InteropEmu.GetScreenSize(false);
if(!_customSize && this.WindowState != FormWindowState.Maximized) {
Size sizeGap = this.Size - this.ClientSize;
this.Resize -= frmMain_Resize;
this.ClientSize = new Size(Math.Max(this.MinimumSize.Width - sizeGap.Width, size.Width), Math.Max(this.MinimumSize.Height - sizeGap.Height, size.Height + menuStrip.Height));
this.Resize += frmMain_Resize;
}
Rectangle screenBounds = Screen.FromHandle(this.Handle).Bounds;
if(size.Width > screenBounds.Width || size.Height > screenBounds.Height) {
SetScaleBasedOnWindowSize();
} else {
if(!_customSize && this.WindowState != FormWindowState.Maximized) {
Size sizeGap = this.Size - this.ClientSize;
this.Resize -= frmMain_Resize;
this.ClientSize = new Size(Math.Max(this.MinimumSize.Width - sizeGap.Width, size.Width), Math.Max(this.MinimumSize.Height - sizeGap.Height, size.Height + menuStrip.Height));
this.Resize += frmMain_Resize;
} else {
SetScaleBasedOnWindowSize();
}
ctrlRenderer.Size = new Size(size.Width, size.Height);
ctrlRenderer.Left = (panelRenderer.Width - ctrlRenderer.Width) / 2;
ctrlRenderer.Top = (panelRenderer.Height - ctrlRenderer.Height) / 2;
ctrlRenderer.Size = new Size(size.Width, size.Height);
ctrlRenderer.Left = (panelRenderer.Width - ctrlRenderer.Width) / 2;
ctrlRenderer.Top = (panelRenderer.Height - ctrlRenderer.Height) / 2;
}
}
private void frmMain_Resize(object sender, EventArgs e)
@ -350,9 +358,10 @@ namespace Mesen.GUI.Forms
this.menuStrip.Visible = true;
this.WindowState = _originalWindowState;
this.FormBorderStyle = FormBorderStyle.Sizable;
this.SetScale(_regularScale);
this.UpdateScaleMenu(_regularScale);
VideoInfo.ApplyConfig();
SetScaleBasedOnWindowSize();
VideoInfo.ApplyConfig();
UpdateViewerSize();
}
this.Resize += frmMain_Resize;