Skip to content

Update AcrylicWindow.cs #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update AcrylicWindow.cs #161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 38 additions & 34 deletions FluentWPF/AcrylicWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,25 +310,25 @@ internal static void FixMaximizedWindowSize(IntPtr hwnd)
if (win != null && _internalStateTable.TryGetValue(win, out var internalState))
{
internalState.RestoringState = WindowRestoringState.Default;
}

win.WindowStyle = WindowStyle.None;
win.WindowStyle = WindowStyle.None;

var hMonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
var monitorInfo = new MONITORINFO
{
cbSize = Marshal.SizeOf(typeof(MONITORINFO))
};
var hMonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
var monitorInfo = new MONITORINFO
{
cbSize = Marshal.SizeOf(typeof(MONITORINFO))
};

GetMonitorInfo(hMonitor, ref monitorInfo);
var workingRectangle = monitorInfo.rcWork;
var monitorRectangle = monitorInfo.rcMonitor;
GetMonitorInfo(hMonitor, ref monitorInfo);
var workingRectangle = monitorInfo.rcWork;
var monitorRectangle = monitorInfo.rcMonitor;

var x = workingRectangle.left;
var y = workingRectangle.top;
var width = Math.Abs(workingRectangle.right - workingRectangle.left);
var height = Math.Abs(workingRectangle.bottom - workingRectangle.top);
MoveWindow(hwnd, x, y, width, height, true);
var x = workingRectangle.left;
var y = workingRectangle.top;
var width = Math.Abs(workingRectangle.right - workingRectangle.left);
var height = Math.Abs(workingRectangle.bottom - workingRectangle.top) - 1;
MoveWindow(hwnd, x, y, width, height, true);
}
}

protected static IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
Expand Down Expand Up @@ -372,25 +372,29 @@ protected static IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lPar
var monitorRectangle = monitorInfo.rcMonitor;

var win = (Window)HwndSource.FromHwnd(hwnd).RootVisual;
GetDpiForMonitor(hMonitor, MONITOR_DPI_TYPE.MDT_EFFECTIVE_DPI, out var dpiX, out var dpiY);
var maxWidth = win.MaxWidth / 96.0 * dpiX;
var maxHeight = win.MaxHeight / 96.0 * dpiY;
var minWidth = win.MinWidth / 96.0 * dpiX;
var minHeight = win.MinHeight / 96.0 * dpiY;

// ウィンドウ最大化時の位置とサイズを指定
info.ptMaxPosition.x = Math.Abs(workingRectangle.left - monitorRectangle.left);
info.ptMaxPosition.y = Math.Abs(workingRectangle.top - monitorRectangle.top);
info.ptMaxSize.x = (int)Math.Min(Math.Abs(workingRectangle.right - monitorRectangle.left), maxWidth);
info.ptMaxSize.y = (int)Math.Min(Math.Abs(workingRectangle.bottom - monitorRectangle.top), maxHeight);

// ウィンドウのリサイズ可能サイズを設定
info.ptMaxTrackSize.x = (int)Math.Min(info.ptMaxTrackSize.x, maxWidth);
info.ptMaxTrackSize.y = (int)Math.Min(info.ptMaxTrackSize.y, maxHeight);
info.ptMinTrackSize.x = (int)Math.Max(info.ptMinTrackSize.x, minWidth);
info.ptMinTrackSize.y = (int)Math.Max(info.ptMinTrackSize.y, minHeight);

Marshal.StructureToPtr(info, lParam, true);
if (win != null)
{
GetDpiForMonitor(hMonitor, MONITOR_DPI_TYPE.MDT_EFFECTIVE_DPI, out var dpiX, out var dpiY);

var maxWidth = win.MaxWidth / 96.0 * dpiX;
var maxHeight = win.MaxHeight / 96.0 * dpiY;
var minWidth = win.MinWidth / 96.0 * dpiX;
var minHeight = win.MinHeight / 96.0 * dpiY;

// ウィンドウ最大化時の位置とサイズを指定
info.ptMaxPosition.x = Math.Abs(workingRectangle.left - monitorRectangle.left);
info.ptMaxPosition.y = Math.Abs(workingRectangle.top - monitorRectangle.top);
info.ptMaxSize.x = (int)Math.Min(Math.Abs(workingRectangle.right - monitorRectangle.left), maxWidth);
info.ptMaxSize.y = (int)Math.Min(Math.Abs(workingRectangle.bottom - monitorRectangle.top), maxHeight);

// ウィンドウのリサイズ可能サイズを設定
info.ptMaxTrackSize.x = (int)Math.Min(info.ptMaxTrackSize.x, maxWidth);
info.ptMaxTrackSize.y = (int)Math.Min(info.ptMaxTrackSize.y, maxHeight);
info.ptMinTrackSize.x = (int)Math.Max(info.ptMinTrackSize.x, minWidth);
info.ptMinTrackSize.y = (int)Math.Max(info.ptMinTrackSize.y, minHeight);

Marshal.StructureToPtr(info, lParam, true);
}
return IntPtr.Zero;
}
else if (msg == WM_SIZE && wParam == (IntPtr)SizeEvents.SIZE_MAXIMIZED)
Expand Down