Merge pull request AvaloniaUI#9566 from AvaloniaUI/fixes/9565-mac-ful…

…lscreen-children MacOS: Only bring windows to front if they're on the active space.
donandren · Dec 6, 2022 · 1dacc90 · 1dacc90
1 parent d3723c6
commit 1dacc90
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -136,7 +136,11 @@
 
         for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
         {
-            (*iterator)->BringToFront();
+            auto window = (*iterator)->Window;
+
+            // #9565: Only bring window to front if it's on the currently active space
+            if ([window isOnActiveSpace])
+                (*iterator)->BringToFront();
         }
     }
 }
@@ -160,6 +164,9 @@
 
 void WindowImpl::EndStateTransition() {
     _transitioningWindowState = false;
+
+    // Ensure correct order of child windows after fullscreen transition.
+    BringToFront();
 }
 
 SystemDecorations WindowImpl::Decorations() {

diff --git a/samples/IntegrationTestApp/MainWindow.axaml b/samples/IntegrationTestApp/MainWindow.axaml
@@ -15,11 +15,15 @@
       </NativeMenuItem>
       <NativeMenuItem Header="View">
         <NativeMenu/>
-      </NativeMenuItem>  
+      </NativeMenuItem>
     </NativeMenu>
   </NativeMenu.Menu>
   <DockPanel>
     <NativeMenuBar DockPanel.Dock="Top"/>
+    <StackPanel DockPanel.Dock="Bottom" Margin="4" Orientation="Horizontal">
+      <TextBlock Margin="0,0,4,0">WindowState:</TextBlock>
+      <TextBlock Name="MainWindowState" Text="{Binding WindowState}"/>
+    </StackPanel>
 
     <TabControl TabStripPlacement="Left" Name="MainTabs">
       <TabItem Header="Automation">
@@ -110,13 +114,14 @@
             <ComboBoxItem>CenterOwner</ComboBoxItem>
           </ComboBox>
           <ComboBox Name="ShowWindowState" SelectedIndex="0">
-            <ComboBoxItem>Normal</ComboBoxItem>
-            <ComboBoxItem>Minimized</ComboBoxItem>
-            <ComboBoxItem>Maximized</ComboBoxItem>
-            <ComboBoxItem>FullScreen</ComboBoxItem>
+            <ComboBoxItem Name="ShowWindowStateNormal">Normal</ComboBoxItem>
+            <ComboBoxItem Name="ShowWindowStateMinimized">Minimized</ComboBoxItem>
+            <ComboBoxItem Name="ShowWindowStateMaximized">Maximized</ComboBoxItem>
+            <ComboBoxItem Name="ShowWindowStateFullScreen">FullScreen</ComboBoxItem>
           </ComboBox>
           <Button Name="ShowWindow">Show Window</Button>
           <Button Name="SendToBack">Send to Back</Button>
+          <Button Name="EnterFullscreen">Enter Fullscreen</Button>
           <Button Name="ExitFullscreen">Exit Fullscreen</Button>
           <Button Name="RestoreAll">Restore All</Button>
         </StackPanel>

diff --git a/samples/IntegrationTestApp/MainWindow.axaml.cs b/samples/IntegrationTestApp/MainWindow.axaml.cs
@@ -129,6 +129,8 @@ private void OnButtonClick(object? sender, RoutedEventArgs e)
                 ShowWindow();
             if (source?.Name == "SendToBack")
                 SendToBack();
+            if (source?.Name == "EnterFullscreen")
+                WindowState = WindowState.FullScreen;
             if (source?.Name == "ExitFullscreen")
                 WindowState = WindowState.Normal;
             if (source?.Name == "RestoreAll")

diff --git a/samples/IntegrationTestApp/ShowWindowTest.axaml b/samples/IntegrationTestApp/ShowWindowTest.axaml
@@ -26,10 +26,10 @@
 
     <Label Grid.Column="0" Grid.Row="7">WindowState</Label>
     <ComboBox Name="WindowState" Grid.Column="1" Grid.Row="7" SelectedIndex="{Binding WindowState}">
-      <ComboBoxItem>Normal</ComboBoxItem>
-      <ComboBoxItem>Minimized</ComboBoxItem>
-      <ComboBoxItem>Maximized</ComboBoxItem>
-      <ComboBoxItem>FullScreen</ComboBoxItem>
+      <ComboBoxItem Name="WindowStateNormal">Normal</ComboBoxItem>
+      <ComboBoxItem Name="WindowStateMinimized">Minimized</ComboBoxItem>
+      <ComboBoxItem Name="WindowStateMaximized">Maximized</ComboBoxItem>
+      <ComboBoxItem Name="WindowStateFullScreen">FullScreen</ComboBoxItem>
     </ComboBox>
     <Button Name="HideButton" Grid.Row="8" Command="{Binding $parent[Window].Hide}">Hide</Button>
   </Grid>