Skip to content

Fix window content layout and restore behavior from system tray #5152

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

Merged
Gabriel Dufresne (GabrielDuf) merged 2 commits into from
Jul 20, 2026
+16 −17
Merged

Fix window content layout and restore behavior from system tray #5152

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f97c16
Fix maximized window content not filling the work area at fractional DPI
GabrielDuf Jul 17, 2026
050d9a3
Preserve maximized state when restoring from the system tray
GabrielDuf Jul 20, 2026
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
33 changes: 16 additions & 17 deletions src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,25 +935,19 @@ private static nint OnWindowsWndProc(nint hWnd, uint msg, nint wParam, nint lPar
// the top inset, leaving the WS_THICKFRAME left/right/bottom resize border as glass.
if (msg == WM_NCCALCSIZE && wParam.ToInt64() != 0)
{
// When maximized, Windows places the window so its resize border sits offscreen
// (top-left near (-frame, -frame)). Claiming the whole window rect as client then
// pushes the title bar's top few pixels off the monitor, clipping the search box
// so it hugs the top edge (#5013). While maximized, inset the client rect by the
// frame thickness so it fills exactly the visible monitor; keep the full-rect
// (borderless, extended) client otherwise.
// Maximized: client = work area (the window already equals it), not a phantom frame inset (#5117/#5013).
if (NativeMethods.IsZoomed(hWnd))
{
uint dpi = NativeMethods.GetDpiForWindow(hWnd);
if (dpi == 0) dpi = 96;
var border = default(NativeMethods.RECT);
if (NativeMethods.AdjustWindowRectExForDpi(ref border, WS_THICKFRAME, false, 0, dpi))
nint monitor = NativeMethods.MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST);
if (monitor != 0)
{
var p = Marshal.PtrToStructure<NativeMethods.NCCALCSIZE_PARAMS>(lParam);
p.rgrc0.Left -= border.Left;
p.rgrc0.Top -= border.Top;
p.rgrc0.Right -= border.Right;
p.rgrc0.Bottom -= border.Bottom;
Marshal.StructureToPtr(p, lParam, false);
var mi = new NativeMethods.MONITORINFO { cbSize = Marshal.SizeOf<NativeMethods.MONITORINFO>() };
if (NativeMethods.GetMonitorInfo(monitor, ref mi))
{
var p = Marshal.PtrToStructure<NativeMethods.NCCALCSIZE_PARAMS>(lParam);
p.rgrc0 = mi.rcWork;
Marshal.StructureToPtr(p, lParam, false);
}
}
}
handled = true;
Expand Down Expand Up @@ -1349,9 +1343,14 @@ public void ShowRuntimeNotification(string title, string message, RuntimeNotific
// ─── BackgroundAPI integration ────────────────────────────────────────────
public void ShowFromTray()
{
// Show() restores a hidden window to its pre-maximize size, so re-apply Maximized if it was:
// a native maximize (Snap Layouts / Win+Up) never updates Avalonia's _showWindowState.
bool restoreMaximized = !IsVisible && WindowState == WindowState.Maximized;
if (!IsVisible)
Show();
if (WindowState == WindowState.Minimized)
if (restoreMaximized)
WindowState = WindowState.Maximized;
else if (WindowState == WindowState.Minimized)
WindowState = WindowState.Normal;
Activate();
}
Expand Down
Loading