Merge pull request #9566 from AvaloniaUI/fixes/9565-mac-fullscreen-children

MacOS: Only bring windows to front if they're on the active space.

native/Avalonia.Native/src/OSX/WindowImpl.mm

@@ -137,7 +137,11 @@ void WindowImpl::BringToFront()
         
         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();
         }
     }
 }
@@ -161,6 +165,9 @@ void WindowImpl::StartStateTransition() {
 
 void WindowImpl::EndStateTransition() {
     _transitioningWindowState = false;
+    
+    // Ensure correct order of child windows after fullscreen transition.
+    BringToFront();
 }
 
 SystemDecorations WindowImpl::Decorations() {

samples/IntegrationTestApp/MainWindow.axaml

@@ -17,11 +17,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">
@@ -129,13 +133,14 @@
             <ComboBoxItem>CenterOwner</ComboBoxItem>
           </ComboBox>
           <ComboBox Name="ShowWindowState" SelectedIndex="0">
-            <ComboBoxItem>Normal</ComboBoxItem>
+            <ComboBoxItem Name="ShowWindowStateNormal">Normal</ComboBoxItem>
-            <ComboBoxItem>Minimized</ComboBoxItem>
+            <ComboBoxItem Name="ShowWindowStateMinimized">Minimized</ComboBoxItem>
-            <ComboBoxItem>Maximized</ComboBoxItem>
+            <ComboBoxItem Name="ShowWindowStateMaximized">Maximized</ComboBoxItem>
-            <ComboBoxItem>FullScreen</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>

samples/IntegrationTestApp/MainWindow.axaml.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia;
@@ -178,6 +179,8 @@ namespace IntegrationTestApp
                 ShowWindow();
             if (source?.Name == "SendToBack")
                 SendToBack();
+            if (source?.Name == "EnterFullscreen")
+                WindowState = WindowState.FullScreen;
             if (source?.Name == "ExitFullscreen")
                 WindowState = WindowState.Normal;
             if (source?.Name == "RestoreAll")

samples/IntegrationTestApp/ShowWindowTest.axaml

@@ -27,10 +27,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 Name="WindowStateNormal">Normal</ComboBoxItem>
-      <ComboBoxItem>Minimized</ComboBoxItem>
+      <ComboBoxItem Name="WindowStateMinimized">Minimized</ComboBoxItem>
-      <ComboBoxItem>Maximized</ComboBoxItem>
+      <ComboBoxItem Name="WindowStateMaximized">Maximized</ComboBoxItem>
-      <ComboBoxItem>FullScreen</ComboBoxItem>
+      <ComboBoxItem Name="WindowStateFullScreen">FullScreen</ComboBoxItem>
     </ComboBox>
 
     <Label Grid.Column="0" Grid.Row="8">Order (mac)</Label>

tests/Avalonia.IntegrationTests.Appium/WindowTests.cs

@@ -90,7 +90,7 @@ namespace Avalonia.IntegrationTests.Appium
                     try
                     {
                         _session.FindElementByAccessibilityId("WindowState").SendClick();
-                        _session.FindElementByName("Normal").SendClick();
+                        _session.FindElementByAccessibilityId("WindowStateNormal").SendClick();
 
                         // Wait for animations to run.
                         if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
@@ -155,11 +155,11 @@ namespace Avalonia.IntegrationTests.Appium
             Assert.Equal("Normal", windowState.GetComboBoxValue());
 
             windowState.Click();
-            _session.FindElementByName("Maximized").SendClick();
+            _session.FindElementByAccessibilityId("WindowStateMaximized").SendClick();
             Assert.Equal("Maximized", windowState.GetComboBoxValue());
 
             windowState.Click();
-            _session.FindElementByName("Normal").SendClick();
+            _session.FindElementByAccessibilityId("WindowStateNormal").SendClick();
 
             var current = GetWindowInfo();
             Assert.Equal(original.Position, current.Position);
@@ -169,7 +169,7 @@ namespace Avalonia.IntegrationTests.Appium
             if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || mode == ShowWindowMode.NonOwned)
             {
                 windowState.Click();
-                _session.FindElementByName("FullScreen").SendClick();
+                _session.FindElementByAccessibilityId("WindowStateFullScreen").SendClick();
                 Assert.Equal("FullScreen", windowState.GetComboBoxValue());
 
                 current = GetWindowInfo();
@@ -179,7 +179,7 @@ namespace Avalonia.IntegrationTests.Appium
 
                 windowState.SendClick();
                 
-                _session.FindElementByName("Normal").SendClick();
+                _session.FindElementByAccessibilityId("WindowStateNormal").SendClick();
 
                 current = GetWindowInfo();
                 Assert.Equal(original.Position, current.Position);
@@ -223,13 +223,13 @@ namespace Avalonia.IntegrationTests.Appium
                         // Not sure how to handle testing minimized windows currently.
                         if (state == Controls.WindowState.Minimized)
                             continue;
-                        
+
                         // Child/Modal windows cannot be fullscreen on macOS.
                         if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) &&
                             state == Controls.WindowState.FullScreen &&
                             mode != ShowWindowMode.NonOwned)
                             continue;
-                        
+
                         data.Add(size, mode, state);
                     }
                 }
@@ -286,7 +286,7 @@ namespace Avalonia.IntegrationTests.Appium
             _session.FindElementByName(location.ToString()).SendClick();
 
             stateComboBox.Click();
-            _session.FindElementByName(state.ToString()).SendClick();
+            _session.FindElementByAccessibilityId($"ShowWindowState{state}").SendClick();
 
             return showButton.OpenWindowWithClick();
         }

tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Avalonia.Controls;
+using Avalonia.Utilities;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Interactions;
@@ -114,6 +115,79 @@ namespace Avalonia.IntegrationTests.Appium
                 Assert.Equal(1, secondaryWindowIndex);
             }
         }
+        
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void WindowOrder_Owned_Dialog_Stays_InFront_Of_FullScreen_Parent()
+        {
+            var mainWindow = _session.FindElementByAccessibilityId("MainWindow");
+
+            // Enter fullscreen
+            mainWindow.FindElementByAccessibilityId("EnterFullscreen").Click();
+            
+            // Wait for fullscreen transition.
+            Thread.Sleep(1000);
+
+            // Make sure we entered fullscreen.
+            var windowState = mainWindow.FindElementByAccessibilityId("MainWindowState");
+            Assert.Equal("FullScreen", windowState.Text);
+
+            // Open child window.
+            using (OpenWindow(new PixelSize(200, 100), ShowWindowMode.Owned, WindowStartupLocation.Manual))
+            {
+                mainWindow.SendClick();
+                var secondaryWindowIndex = GetWindowOrder("SecondaryWindow");
+                Assert.Equal(1, secondaryWindowIndex);
+            }
+
+            // Exit fullscreen by menu shortcut Command+R
+            mainWindow.FindElementByAccessibilityId("ExitFullscreen").Click();
+
+            // Wait for restore transition.
+            Thread.Sleep(1000);
+
+            // Make sure we exited fullscreen.
+            mainWindow = _session.FindElementByAccessibilityId("MainWindow");
+            windowState = mainWindow.FindElementByAccessibilityId("MainWindowState");
+            Assert.Equal("Normal", windowState.Text);
+        }
+
+        [PlatformFact(TestPlatforms.MacOS)]
+        public void Does_Not_Switch_Space_From_FullScreen_To_Main_Desktop_When_FullScreen_Window_Clicked()
+        {
+            // Issue #9565
+            var mainWindow = _session.FindElementByAccessibilityId("MainWindow");
+            AppiumWebElement windowState;
+
+            // Open child window.
+            using (OpenWindow(new PixelSize(200, 100), ShowWindowMode.Owned, WindowStartupLocation.Manual))
+            {
+                // Enter fullscreen
+                mainWindow.FindElementByAccessibilityId("EnterFullscreen").Click();
+            
+                // Wait for fullscreen transition.
+                Thread.Sleep(1000);
+
+                // Make sure we entered fullscreen.
+                mainWindow = _session.FindElementByAccessibilityId("MainWindow");
+                windowState = mainWindow.FindElementByAccessibilityId("MainWindowState");
+                Assert.Equal("FullScreen", windowState.Text);
+                
+                // Click on main window
+                mainWindow.Click();
+
+                // Failed here due to #9565: main window is no longer visible as the main space is now shown instead
+                // of the fullscreen space.
+                mainWindow.FindElementByAccessibilityId("ExitFullscreen").Click();
+
+                // Wait for restore transition.
+                Thread.Sleep(1000);
+            }
+
+            // Make sure we exited fullscreen.
+            mainWindow = _session.FindElementByAccessibilityId("MainWindow");
+            windowState = mainWindow.FindElementByAccessibilityId("MainWindowState");
+            Assert.Equal("Normal", windowState.Text);
+        }
 
         [PlatformFact(TestPlatforms.MacOS)]
         public void WindowOrder_NonOwned_Window_Does_Not_Stay_InFront_Of_Parent()