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

new window features

Browse Source
This commit is contained in:
Frank Skare
2021-05-11 17:55:37 +02:00
parent b1388e10e5
commit 69857e0548
4 changed files with 70 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Resources/editor.toml.txt
View File

@@ -343,6 +343,8 @@ default = "height-session"
filter = "Screen"
help = "Setting to remember the window size. (mpv.net specific setting)"
options = [{ name = "video", help = "Window size is set to video resolution" },
{ name = "width-session", help = "Width is remembered in the current session" },
{ name = "width-always", help = "Width is always remembered" },
{ name = "height-session", help = "Height is remembered in the current session" },
{ name = "height-always", help = "Height is always remembered" },
{ name = "always", help = "Size is always remembered" }]

63
src/WinForms/MainForm.cs
View File

@@ -366,6 +366,11 @@ namespace mpvnet
height = ClientSize.Height;
width = height * videoSize.Width / videoSize.Height;
}
else if (App.StartSize == "width-always" || App.StartSize == "width-session")
{
width = ClientSize.Width;
height = (int)Math.Ceiling(width * videoSize.Height / (double)videoSize.Width);
}
}
else
{
@@ -377,16 +382,26 @@ namespace mpvnet
height = savedHeight;
width = height * videoSize.Width / videoSize.Height;
}
else if (App.StartSize == "always" && savedHeight != 0)
{
height = savedHeight;
width = savedWidth;
}
else if (App.StartSize == "height-session")
{
height = autoFitHeight;
width = height * videoSize.Width / videoSize.Height;
}
if (App.StartSize == "width-always" && savedHeight != 0)
{
width = savedWidth;
height = (int)Math.Ceiling(width * videoSize.Height / (double)videoSize.Width);
}
else if (App.StartSize == "width-session")
{
width = autoFitHeight / 9 * 16;
height = (int)Math.Ceiling(width * videoSize.Height / (double)videoSize.Width);
}
else if (App.StartSize == "always" && savedHeight != 0)
{
height = savedHeight;
width = savedWidth;
}
core.WasInitialSizeSet = true;
}
@@ -420,7 +435,7 @@ namespace mpvnet
if (width > maxWidth)
{
width = maxWidth;
height = (int)Math.Ceiling(width * startHeight / (double)width);
height = (int)Math.Ceiling(width * startHeight / (double)startWidth);
}
if (height > maxHeight)
@@ -440,6 +455,14 @@ namespace mpvnet
NativeHelp.AddWindowBorders(Handle, ref rect);
int left = middlePos.X - rect.Width / 2;
int top = middlePos.Y - rect.Height / 2;
Rectangle workingArea = screen.WorkingArea;
Rectangle currentRect = new Rectangle(Left, Top, Width, Height);
if (HorizontalLocation(screen) == -1) left = Left;
if (HorizontalLocation(screen) == 1) left = currentRect.Right - rect.Width;
if (VerticalLocation(screen) == -1) top = Top;
if (VerticalLocation(screen) == 1) top = currentRect.Bottom - rect.Height;
Screen[] screens = Screen.AllScreens;
int minLeft = screens.Select(val => val.WorkingArea.X).Min();
@@ -462,6 +485,34 @@ namespace mpvnet
SetWindowPos(Handle, IntPtr.Zero, left, top, rect.Width, rect.Height, 4);
}
public int HorizontalLocation(Screen screen)
{
Rectangle workingArea = screen.WorkingArea;
Rectangle rect = new Rectangle(Left - workingArea.X, Top - workingArea.Y, Width, Height);
if (rect.X * 3 < workingArea.Width - rect.Right)
return -1;
if (rect.X > (workingArea.Width - rect.Right) * 3)
return 1;
return 0;
}
public int VerticalLocation(Screen screen)
{
Rectangle workingArea = screen.WorkingArea;
Rectangle rect = new Rectangle(Left - workingArea.X, Top - workingArea.Y, Width, Height);
if (rect.Y * 3 < workingArea.Height - rect.Bottom)
return -1;
if (rect.Y > (workingArea.Height - rect.Bottom) * 3)
return 1;
return 0;
}
public void CycleFullscreen(bool enabled)
{
LastCycleFullscreen = Environment.TickCount;