5.5.0.1 Beta

This commit is contained in:
Frank Skare
2021-09-15 11:57:01 +02:00
parent 2fac5d76e9
commit 458007862e
3 changed files with 27 additions and 7 deletions

View File

@@ -1,5 +1,10 @@
5.5.0.1 Beta (2021-??-??) 5.5.0.2 Beta (2021-??-??)
5.5.0.1 Beta (2021-09-15)
- Fix of keepaspect-window=no.
5.4.9.9 Beta (2021-09-14) 5.4.9.9 Beta (2021-09-14)

View File

@@ -135,8 +135,19 @@ namespace mpvnet
void Core_ScaleWindow(float scale) { void Core_ScaleWindow(float scale) {
BeginInvoke(new Action(() => { BeginInvoke(new Action(() => {
int w = (int)(ClientSize.Width * scale); int w, h;
int h = (int)Math.Ceiling(w * Core.VideoSize.Height / (double)Core.VideoSize.Width);
if (Core.KeepaspectWindow || App.StartSize != "always")
{
w = (int)(ClientSize.Width * scale);
h = (int)Math.Ceiling(w * Core.VideoSize.Height / (double)Core.VideoSize.Width);
}
else
{
w = (int)(ClientSize.Width * scale);
h = (int)(ClientSize.Height * scale);
}
SetSize(w, h, Screen.FromControl(this), false); SetSize(w, h, Screen.FromControl(this), false);
})); }));
} }
@@ -158,7 +169,11 @@ namespace mpvnet
void CM_Popup(object sender, EventArgs e) => CursorHelp.Show(); void CM_Popup(object sender, EventArgs e) => CursorHelp.Show();
void Core_VideoSizeChanged() => BeginInvoke(new Action(() => SetFormPosAndSize())); void Core_VideoSizeChanged() => BeginInvoke(new Action(() =>
{
if (Core.KeepaspectWindow || App.StartSize != "always")
SetFormPosAndSize();
}));
void PropChangeFullscreen(bool value) => BeginInvoke(new Action(() => CycleFullscreen(value))); void PropChangeFullscreen(bool value) => BeginInvoke(new Action(() => CycleFullscreen(value)));
@@ -575,7 +590,7 @@ namespace mpvnet
else else
FormBorderStyle = FormBorderStyle.None; FormBorderStyle = FormBorderStyle.None;
if (Core.KeepaspectWindow) if (Core.KeepaspectWindow || App.StartSize != "always")
SetFormPosAndSize(); SetFormPosAndSize();
} }
} }

View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.9.9")] [assembly: AssemblyVersion("5.5.0.1")]
[assembly: AssemblyFileVersion("5.4.9.9")] [assembly: AssemblyFileVersion("5.5.0.1")]