motimat/Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Avalonia.Native] Fix fullscreen transitions with ExtendClientAreaToDecorationsHint windows (#19939)

Browse Source
This commit is contained in:
Tim Miller
2025-10-29 15:58:36 +09:00
committed by GitHub
parent 3ed7b9e9fa
commit c811bd42ae
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/Avalonia.Native/src/OSX/AvnWindow.mm
+21 -16
View File
@@ -436,23 +436,28 @@
return;
}
// If the window has been moved into a position where it's "zoomed"
// Then it should be set as Maximized.
if (window->WindowState() != Maximized && window->IsZoomed())
// Don't adjust window state during fullscreen transitions
// as this can interfere with proper decoration restoration
if(!window->IsTransitioningWindowState())
{
window->SetWindowState(Maximized, false);
}
// We should only return the window state to normal if
// the internal window state is maximized, and macOS says
// the window is no longer zoomed (I.E, the user has moved it)
// Stage Manager will "move" the window when repositioning it
// So if the window was "maximized" before, it should stay maximized
else if(window->WindowState() == Maximized && !window->IsZoomed())
{
// If we're moving the window while maximized,
// we need to let macOS handle if it should be resized
// And not handle it ourselves.
window->SetWindowState(Normal, false);
// If the window has been moved into a position where it's "zoomed"
// Then it should be set as Maximized.
if (window->WindowState() != Maximized && window->IsZoomed())
{
window->SetWindowState(Maximized, false);
}
// We should only return the window state to normal if
// the internal window state is maximized, and macOS says
// the window is no longer zoomed (I.E, the user has moved it)
// Stage Manager will "move" the window when repositioning it
// So if the window was "maximized" before, it should stay maximized
else if(window->WindowState() == Maximized && !window->IsZoomed())
{
// If we're moving the window while maximized,
// we need to let macOS handle if it should be resized
// And not handle it ourselves.
window->SetWindowState(Normal, false);
}
}
}
native/Avalonia.Native/src/OSX/WindowImpl.h
+3 -1
View File
@@ -87,7 +87,9 @@ BEGIN_INTERFACE_MAP()
bool CanBecomeKeyWindow ();
bool CanZoom() override { return _isEnabled && _canMaximize; }
bool IsTransitioningWindowState() { return _transitioningWindowState; }
protected:
virtual NSWindowStyleMask CalculateStyleMask() override;
virtual void UpdateAppearance() override;