Skip to content

Let the resize border win over the caption buttons on the side edges #5477

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
Oct 6, 2026
Merged

Let the resize border win over the caption buttons on the side edges #5477

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fa1751
Let the resize border win over the caption buttons on the side edges
GabrielDuf Oct 6, 2026
86934b3
Inset the caption buttons so the resize band stops overlapping Close
GabrielDuf Oct 6, 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
46 changes: 38 additions & 8 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 @@ -239,6 +239,7 @@ protected override void OnOpened(EventArgs e)

SetupMicaAndAccentBorder();
UpdateWindowCornerPreference();
UpdateCaptionButtonInset();

ActualThemeVariantChanged += (_, _) =>
{
Expand Down Expand Up @@ -1198,6 +1199,28 @@ private void UpdateWindowCornerPreference()
NativeMethods.DwmSetWindowAttribute(handle, DWMWA_WINDOW_CORNER_PREFERENCE, ref corner, sizeof(int));
}

private void UpdateCaptionButtonInset()
{
if (!OperatingSystem.IsWindows() || !WindowButtons.IsVisible)
return;

if (TryGetPlatformHandle()?.Handle is not { } handle || handle == 0)
return;

double inset = 0;
if (!NativeMethods.IsZoomed(handle))
{
uint dpi = NativeMethods.GetDpiForWindow(handle);
if (dpi == 0) dpi = 96;
uint style = (uint)NativeMethods.GetWindowLongPtr(handle, GWL_STYLE).ToInt64();
var frame = default(NativeMethods.RECT);
if (NativeMethods.AdjustWindowRectExForDpi(ref frame, style, false, 0, dpi))
inset = frame.Right / (dpi / 96.0);
}

WindowButtons.Margin = new Thickness(0, 0, inset, 0);
}

private void ApplyWindowBorderColor(nint handle)
{
int color;
Expand Down Expand Up @@ -1241,21 +1264,32 @@ private static nint OnWindowsWndProc(nint hWnd, uint msg, nint wParam, nint lPar
if ((msg == WM_SHOWWINDOW || (msg == WM_SIZE && (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED)))
&& Instance is { } cornerOwner)
{
Dispatcher.UIThread.Post(cornerOwner.UpdateWindowCornerPreference);
Dispatcher.UIThread.Post(() =>
{
cornerOwner.UpdateWindowCornerPreference();
cornerOwner.UpdateCaptionButtonInset();
});
}

if (msg == WM_SETTINGCHANGE && Instance is { } trayOwner)
{
trayOwner.UpdateSystemTrayStatus();
}

int borderEdge = msg == WM_NCHITTEST ? HitTestResizeBorder(hWnd, lParam) : HTNOWHERE;

// ── Snap Layouts: report HTMAXBUTTON over the custom maximize button so Win11 shows the
// layout flyout, and emulate hover/press/click since input now arrives as NC messages. ──
if (Instance is { } self && self.WindowButtons.IsVisible)
{
switch (msg)
{
case WM_NCHITTEST:
if (borderEdge is not HTNOWHERE and not HTTOP)
{
handled = true;
return borderEdge;
}
if (self.HitTestMaximizeButton(lParam))
{
handled = true;
Expand Down Expand Up @@ -1308,14 +1342,10 @@ private static nint OnWindowsWndProc(nint hWnd, uint msg, nint wParam, nint lPar
}
}

if (msg == WM_NCHITTEST)
if (borderEdge != HTNOWHERE)
{
int edge = HitTestResizeBorder(hWnd, lParam);
if (edge != HTNOWHERE)
{
handled = true;
return edge;
}
handled = true;
return borderEdge;
}

// Force client = full window rect. Avalonia's ExtendClientArea handler only overrides
Expand Down
Loading