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

fix geometry

Browse Source
This commit is contained in:
stax76
2024-01-06 12:03:28 +01:00
parent ad94042a2c
commit 85e4e3f9df
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MpvNet.Windows/Resources/editor_conf.txt
View File

@@ -971,9 +971,9 @@ directory = Window
help = <int> Initial window height in percent for audio files. Default: 70
name = geometry
file = mpvnet
file = mpv
directory = Window
help = <x:y> Initial window location in percent. Default: 50:50 (centered)\n\nx=0 docks the window to the left side.\nx=100 docks the window to the right side.\ny=0 docks the window to the top side.\ny=100 docks the window to the bottom side.
help = <x:y> Initial window location in percent. Default: 50:50 (centered)\n\nRequires Windows 11, on Windows 10 it works slightly incorrect due to invisible borders.\n\nx=0 docks the window to the left side.\nx=100 docks the window to the right side.\n\ny=0 docks the window to the top side.\ny=100 docks the window to the bottom side.
name = start-size
file = mpvnet

26
src/MpvNet.Windows/WinForms/MainForm.cs
View File

@@ -688,18 +688,20 @@ public partial class MainForm : Form
int minTop = screens.Select(val => GetWorkingArea(Handle, val.WorkingArea).Y).Min();
int maxBottom = screens.Select(val => GetWorkingArea(Handle, val.WorkingArea).Bottom).Max();
if (load && CommandLine.Contains("geometry"))
if (load)
{
string geometryString = CommandLine.GetValue("geometry");
string geometryString = Player.GetPropertyString("geometry");
var geometry = ParseGeometry(geometryString, GetWorkingArea(
Handle, Screen.FromHandle(Handle).WorkingArea), width, height);
if (!string.IsNullOrEmpty(geometryString))
{
var pos = ParseGeometry(geometryString, width, height);
if (geometry.x != int.MaxValue)
left = geometry.x;
if (pos.X != int.MaxValue)
left = pos.X;
if (geometry.y != int.MaxValue)
top = geometry.y;
if (pos.Y != int.MaxValue)
top = pos.Y;
}
}
if (left < minLeft)
@@ -718,15 +720,17 @@ public partial class MainForm : Form
SetWindowPos(Handle, IntPtr.Zero, left, top, width, height, SWP_NOACTIVATE);
}
(int x, int y) ParseGeometry(string input, Rectangle workingArea, int width, int height)
Point ParseGeometry(string input, int width, int height)
{
int x = int.MaxValue;
int y = int.MaxValue;
Match match = Regex.Match(input, @"^(\d+)%?:(\d+)%?$");
Match match = Regex.Match(input, @"^\+(\d+)%?\+(\d+)%?$");
if (match.Success)
{
Rectangle workingArea = GetWorkingArea(Handle, Screen.FromHandle(Handle).WorkingArea);
x = int.Parse(match.Groups[1].Value);
y = int.Parse(match.Groups[2].Value);
@@ -734,7 +738,7 @@ public partial class MainForm : Form
y = workingArea.Top + Convert.ToInt32((workingArea.Height - height) / 100.0 * y);
}
return (x, y);
return new Point(x, y);
}
public void CycleFullscreen(bool enabled)