tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix window restore maximize statate on secondary monitor.

Browse Source
This commit is contained in:
MBucari 2023-03-11 21:33:55 -07:00
parent 5ec01913d5
commit 3f0e6b9ee5
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/LibationWinForms/FormSaveExtension.cs
View File

@ -2,6 +2,7 @@
using System.Linq; using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using LibationFileManager; using LibationFileManager;
using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
namespace LibationWinForms namespace LibationWinForms
{ {
@ -44,20 +45,31 @@ namespace LibationWinForms
var rect = new Rectangle(x, y, savedState.Width, savedState.Height); var rect = new Rectangle(x, y, savedState.Width, savedState.Height);
// is proposed rect on a screen? if (savedState.IsMaximized)
if (Screen.AllScreens.Any(screen => screen.WorkingArea.Contains(rect)))
{ {
//When a window is maximized, the client rectangle is not on a screen (y is negative).
form.StartPosition = FormStartPosition.Manual; form.StartPosition = FormStartPosition.Manual;
form.DesktopBounds = rect; form.DesktopBounds = rect;
// FINAL: for Maximized: start normal state, set size and location, THEN set max state
form.WindowState = FormWindowState.Maximized;
} }
else else
{ {
form.StartPosition = FormStartPosition.WindowsDefaultLocation; // is proposed rect on a screen?
form.Size = rect.Size; if (Screen.AllScreens.Any(screen => screen.WorkingArea.Contains(rect)))
} {
form.StartPosition = FormStartPosition.Manual;
form.DesktopBounds = rect;
}
else
{
form.StartPosition = FormStartPosition.WindowsDefaultLocation;
form.Size = rect.Size;
}
// FINAL: for Maximized: start normal state, set size and location, THEN set max state form.WindowState = FormWindowState.Normal;
form.WindowState = savedState.IsMaximized ? FormWindowState.Maximized : FormWindowState.Normal; }
} }
public static void SaveSizeAndLocation(this Form form, Configuration config) public static void SaveSizeAndLocation(this Form form, Configuration config)