Skip to content
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

Jump to bottom

macOS: Fix window order breaking when closing modal dialog #10427

Merged
merged 4 commits into from
Feb 22, 2023
Merged

macOS: Fix window order breaking when closing modal dialog #10427

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
3096a2d
Add failing integration test.
grokys Feb 21, 2023
e77c79b
Enforce window order after a delay.
grokys Feb 21, 2023
dcb18e1
Merge branch 'master' into fixes/macos-close-window-zorder
grokys Feb 22, 2023
c837c10
Don't call BringToFront on closed window.
grokys Feb 22, 2023
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
6 changes: 4 additions & 2 deletions native/Avalonia.Native/src/OSX/AvnWindow.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,12 +292,14 @@ - (void)windowDidBecomeKey:(NSNotification *_Nonnull)notification
{
if (_parent == nullptr)
return;

_parent->BringToFront();

dispatch_async(dispatch_get_main_queue(), ^{
@try {
[self invalidateShadow];
[self invalidateShadow];
if (self->_parent != nullptr)
self->_parent->BringToFront();
}
@finally{
}
Expand Down
12 changes: 12 additions & 0 deletions tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,18 @@ public void WindowOrder_Owned_Dialog_Stays_InFront_Of_FullScreen_Parent()
windowState = mainWindow.FindElementByAccessibilityId("MainWindowState");
Assert.Equal("Normal", windowState.Text);
}

[PlatformFact(TestPlatforms.MacOS)]
public void WindowOrder_Owned_Dialog_Stays_InFront_Of_Parent_After_Modal_Closed()
{
using (OpenWindow(new PixelSize(200, 300), ShowWindowMode.Owned, WindowStartupLocation.Manual))
{
OpenWindow(null, ShowWindowMode.Modal, WindowStartupLocation.Manual).Dispose();

var secondaryWindowIndex = GetWindowOrder("SecondaryWindow");
Assert.Equal(1, secondaryWindowIndex);
}
}

[PlatformFact(TestPlatforms.MacOS)]
public void Does_Not_Switch_Space_From_FullScreen_To_Main_Desktop_When_FullScreen_Window_Clicked()
Expand Down