linus/mpv.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5.5.0.2 Beta

Browse Source
This commit is contained in:
Frank Skare
2021-09-15 13:25:58 +02:00
parent 458007862e
commit a3b6af9f22
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Misc/MainForm.cs
View File

@@ -137,15 +137,15 @@ namespace mpvnet
BeginInvoke(new Action(() => {
int w, h;
if (Core.KeepaspectWindow || App.StartSize != "always")
if (KeepSize())
{
w = (int)(ClientSize.Width * scale);
h = (int)Math.Ceiling(w * Core.VideoSize.Height / (double)Core.VideoSize.Width);
h = (int)(ClientSize.Height * scale);
}
else
{
w = (int)(ClientSize.Width * scale);
h = (int)(ClientSize.Height * scale);
h = (int)Math.Ceiling(w * Core.VideoSize.Height / (double)Core.VideoSize.Width);
}
SetSize(w, h, Screen.FromControl(this), false);
@@ -171,7 +171,7 @@ namespace mpvnet
void Core_VideoSizeChanged() => BeginInvoke(new Action(() =>
{
if (Core.KeepaspectWindow || App.StartSize != "always")
if (!KeepSize())
SetFormPosAndSize();
}));
@@ -181,6 +181,8 @@ namespace mpvnet
bool IsCommandPaletteVissible() => CommandPaletteHost != null && CommandPaletteHost.Visible;
bool KeepSize() => !Core.KeepaspectWindow || App.StartSize == "always";
bool IsMouseInOSC()
{
Point pos = PointToClient(MousePosition);
@@ -422,7 +424,7 @@ namespace mpvnet
if (Core.WasInitialSizeSet)
{
if (App.StartSize == "always" || !Core.KeepaspectWindow)
if (KeepSize())
{
width = ClientSize.Width;
height = ClientSize.Height;
@@ -590,7 +592,7 @@ namespace mpvnet
else
FormBorderStyle = FormBorderStyle.None;
if (Core.KeepaspectWindow || App.StartSize != "always")
if (!KeepSize())
SetFormPosAndSize();
}
}