Skip to content

osx: keep window creation on-screen during display reconfiguration #21543

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
MrJul merged 4 commits into from
Aug 19, 2026
Merged

osx: keep window creation on-screen during display reconfiguration #21543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94a243a
osx: anchor new windows to the primary screen origin
brianwphamSF Jun 10, 2026
9ce117c
osx: keep window construction resilient when no screen contains it
brianwphamSF Jun 10, 2026
b34a51d
Merge branch 'main' into fix/macos-window-offscreen-placement
MrJul Aug 19, 2026
690774c
Less verbose comments
MrJul Aug 19, 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
14 changes: 12 additions & 2 deletions native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,11 +465,21 @@ static void ActivateApplication() {
}

void WindowBaseImpl::CreateNSWindow(bool usePanel) {
// Anchor the content rect to the primary screen's origin. It's usually at (0,0), but can be offset while the
// display server is mid-reconfiguration. This ensures the window is always on a proper screen.
// See https://github.com/AvaloniaUI/Avalonia/issues/18895
NSPoint origin = NSZeroPoint;
NSArray<NSScreen*>* screens = [NSScreen screens];
if (screens.count > 0)
origin = screens.firstObject.frame.origin;

NSRect contentRect = NSRect { origin.x, origin.y, lastSize };

if (usePanel) {
Window = [[AvnPanel alloc] initWithParent:this contentRect:NSRect{0, 0, lastSize} styleMask:NSWindowStyleMaskBorderless];
Window = [[AvnPanel alloc] initWithParent:this contentRect:contentRect styleMask:NSWindowStyleMaskBorderless];
[Window setHidesOnDeactivate:false];
} else {
Window = [[AvnWindow alloc] initWithParent:this contentRect:NSRect{0, 0, lastSize} styleMask:NSWindowStyleMaskBorderless];
Window = [[AvnWindow alloc] initWithParent:this contentRect:contentRect styleMask:NSWindowStyleMaskBorderless];
}
}

Expand Down
16 changes: 14 additions & 2 deletions src/Avalonia.Native/WindowImplBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,23 @@ internal override void Init(MacOSTopLevelHandle handle)

base.Init(handle);

int defaultWidth = 0, defaultHeight = 0;

var monitor = this.TryGetFeature<IScreenImpl>()!.AllScreens
.OrderBy(x => x.Scaling)
.First(m => m.Bounds.Contains(Position));
.FirstOrDefault(m => m.Bounds.Contains(Position));

if (monitor != null)
{
// Emulate Windows 7+ default window size behavior.
defaultWidth = (int)(monitor.WorkingArea.Width * 0.75d);
defaultHeight = (int)(monitor.WorkingArea.Height * 0.7d);
}

defaultWidth = Math.Max(defaultWidth, 300);
defaultHeight = Math.Max(defaultHeight, 200);

Resize(new Size(monitor.WorkingArea.Width * 0.75d, monitor.WorkingArea.Height * 0.7d), WindowResizeReason.Layout);
Resize(new Size(defaultWidth, defaultHeight), WindowResizeReason.Layout);
}

public void Activate()
Expand Down