From be8c413a74062e09465a7b2d912c29e901447018 Mon Sep 17 00:00:00 2001
From: Stefan Koell <stefan.koell@royalapps.com>
Date: Sat, 28 Dec 2024 13:09:00 +0100
Subject: [PATCH 01/17] Fix TopMost handling for Popups on Windows

---
 samples/ControlCatalog/MainView.xaml          |  3 +
 samples/ControlCatalog/Pages/PopupsPage.xaml  | 18 ++++
 .../ControlCatalog/Pages/PopupsPage.xaml.cs   | 88 +++++++++++++++++++
 src/Avalonia.Controls/Primitives/PopupRoot.cs |  6 +-
 src/Windows/Avalonia.Win32/PopupImpl.cs       |  3 +-
 5 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 samples/ControlCatalog/Pages/PopupsPage.xaml
 create mode 100644 samples/ControlCatalog/Pages/PopupsPage.xaml.cs

diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index e3eed5fb0e..d86d2a98e6 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -139,6 +139,9 @@
       <TabItem Header="Pointers">
         <pages:PointersPage />
       </TabItem>
+      <TabItem Header="Popups">
+        <pages:PopupsPage />
+      </TabItem>
       <TabItem Header="ProgressBar">
         <pages:ProgressBarPage />
       </TabItem>
diff --git a/samples/ControlCatalog/Pages/PopupsPage.xaml b/samples/ControlCatalog/Pages/PopupsPage.xaml
new file mode 100644
index 0000000000..2dedb0e019
--- /dev/null
+++ b/samples/ControlCatalog/Pages/PopupsPage.xaml
@@ -0,0 +1,18 @@
+<UserControl x:Class="ControlCatalog.Pages.PopupsPage"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  
+  <StackPanel Orientation="Vertical" Spacing="10">
+    
+    <TextBlock Text="'Light Dismiss' Popup" />
+    <Button Content="Show Popup" Click="ButtonLightDismiss_OnClick" />
+
+    <TextBlock Text="Popup that stays open" />
+    <Button Content="Show Popup" Click="ButtonPopupStaysOpen_OnClick" />
+
+    <TextBlock Text="TopMost popup that stays open" />
+    <Button Content="Show Popup" Click="ButtonTopMostPopupStaysOpen" />
+
+  </StackPanel>
+  
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/PopupsPage.xaml.cs b/samples/ControlCatalog/Pages/PopupsPage.xaml.cs
new file mode 100644
index 0000000000..c9df07c240
--- /dev/null
+++ b/samples/ControlCatalog/Pages/PopupsPage.xaml.cs
@@ -0,0 +1,88 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages;
+
+public class PopupsPage : UserControl
+{
+    private Popup? _popup;
+    private Popup? _topMostPopup;
+    public PopupsPage()
+    {
+        InitializeComponent();
+
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+
+    private void ButtonLightDismiss_OnClick(object sender, RoutedEventArgs e)
+    {
+        new Popup
+        {
+            Placement = PlacementMode.Bottom,
+            PlacementTarget = sender as Button,
+            Child = new Panel { Margin = new Thickness(10) ,Children = { new TextBlock { Text = "Popup Content" } }},
+            IsLightDismissEnabled = true,
+            IsOpen = true
+        };
+    }
+
+    private void ButtonPopupStaysOpen_OnClick(object sender, RoutedEventArgs e)
+    {
+        if (_popup is not null)
+            return;
+        
+        var closeButton = new Button { Content = "Click to Close" };
+        closeButton.Click += (o, args) =>
+        {
+            if (_popup is null)
+                return;
+            _popup.IsOpen = false;
+            _popup = null;
+        };
+        _popup = new Popup
+        {
+            Placement = PlacementMode.Bottom,
+            PlacementTarget = sender as Button,
+            Child = new Panel
+            {
+                Margin = new Thickness(10), Children = { closeButton }
+            },
+            IsLightDismissEnabled = false,
+            IsOpen = true
+        };
+    }
+
+    private void ButtonTopMostPopupStaysOpen(object sender, RoutedEventArgs e)
+    {
+        if (_topMostPopup is not null)
+            return;
+        
+        var closeButton = new Button { Content = "Click to Close" };
+        closeButton.Click += (o, args) =>
+        {
+            if (_topMostPopup is null)
+                return;
+            _topMostPopup.IsOpen = false;
+            _topMostPopup = null;
+        };
+        _topMostPopup = new Popup
+        {
+            Placement = PlacementMode.Bottom,
+            PlacementTarget = sender as Button,
+            Child = new Panel
+            {
+                Margin = new Thickness(10), Children = { closeButton }
+            },
+            IsLightDismissEnabled = false,
+            Topmost = true,
+            IsOpen = true
+        };
+    }
+}
diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index f88ed0b93b..fd58f682c7 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -154,7 +154,11 @@ namespace Avalonia.Controls.Primitives
             UpdatePosition();
         }
 
-        public void SetChild(Control? control) => Content = control;
+        public void SetChild(Control? control)
+        {
+            PlatformImpl?.SetTopmost(Topmost);
+            Content = control;
+        }
 
         public void TakeFocus() => PlatformImpl?.TakeFocus();
 
diff --git a/src/Windows/Avalonia.Win32/PopupImpl.cs b/src/Windows/Avalonia.Win32/PopupImpl.cs
index 95c8178adc..4a3dae4fa7 100644
--- a/src/Windows/Avalonia.Win32/PopupImpl.cs
+++ b/src/Windows/Avalonia.Win32/PopupImpl.cs
@@ -53,8 +53,7 @@ namespace Avalonia.Win32
                 UnmanagedMethods.WindowStyles.WS_CLIPCHILDREN;
 
             UnmanagedMethods.WindowStyles exStyle =
-                UnmanagedMethods.WindowStyles.WS_EX_TOOLWINDOW |
-                UnmanagedMethods.WindowStyles.WS_EX_TOPMOST;
+                UnmanagedMethods.WindowStyles.WS_EX_TOOLWINDOW;
 
             var result = UnmanagedMethods.CreateWindowEx(
                 (int)exStyle,

From 477a95627956d952e48ad3f14a686eef0b19c4ee Mon Sep 17 00:00:00 2001
From: Stefan Koell <stefan.koell@royalapps.com>
Date: Sat, 28 Dec 2024 13:56:28 +0100
Subject: [PATCH 02/17] Properly handle TopMost property changes

---
 src/Avalonia.Controls/Primitives/PopupRoot.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index fd58f682c7..170ef73f52 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -154,11 +154,7 @@ namespace Avalonia.Controls.Primitives
             UpdatePosition();
         }
 
-        public void SetChild(Control? control)
-        {
-            PlatformImpl?.SetTopmost(Topmost);
-            Content = control;
-        }
+        public void SetChild(Control? control) => Content = control;
 
         public void TakeFocus() => PlatformImpl?.TakeFocus();
 
@@ -229,6 +225,10 @@ namespace Avalonia.Controls.Primitives
             {
                 PlatformImpl?.SetWindowManagerAddShadowHint(change.GetNewValue<bool>());
             }
+            else if (change.Property == TopmostProperty)
+            {
+                PlatformImpl?.SetTopmost(Topmost);
+            }
         }
     }
 }

From ce2525b09f384e59b43ab99caed0fe40c63c6ede Mon Sep 17 00:00:00 2001
From: Stefan Koell <stefan.koell@royalapps.com>
Date: Sat, 28 Dec 2024 14:04:46 +0100
Subject: [PATCH 03/17] Call SetTopMost in PopupRoot constructor (similar to
 SetWindowManagerAddShadowHint)

---
 src/Avalonia.Controls/Primitives/PopupRoot.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index 170ef73f52..38c81ee4af 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -61,6 +61,7 @@ namespace Avalonia.Controls.Primitives
         {
             ParentTopLevel = parent;
             impl.SetWindowManagerAddShadowHint(WindowManagerAddShadowHint);
+            impl.SetTopmost(Topmost);
         }
 
         /// <summary>

From 8961609463674cdef8032ab2cf051dddae7ba81e Mon Sep 17 00:00:00 2001
From: Stefan Koell <stefan.koell@royalapps.com>
Date: Sat, 28 Dec 2024 17:05:58 +0100
Subject: [PATCH 04/17] Make sure the parent is focused when the popup is
 clicked directly to activate the app.

---
 .../ControlCatalog/Pages/PopupsPage.xaml.cs   | 29 +++++++++++++++++--
 src/Windows/Avalonia.Win32/PopupImpl.cs       |  4 +++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/samples/ControlCatalog/Pages/PopupsPage.xaml.cs b/samples/ControlCatalog/Pages/PopupsPage.xaml.cs
index c9df07c240..2b9449b0cf 100644
--- a/samples/ControlCatalog/Pages/PopupsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/PopupsPage.xaml.cs
@@ -1,8 +1,11 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Interactivity;
+using Avalonia.Layout;
 using Avalonia.Markup.Xaml;
+using Avalonia.Media;
 
 namespace ControlCatalog.Pages;
 
@@ -43,6 +46,8 @@ public class PopupsPage : UserControl
         {
             if (_popup is null)
                 return;
+            
+            LogicalChildren.Remove(_popup);
             _popup.IsOpen = false;
             _popup = null;
         };
@@ -50,13 +55,31 @@ public class PopupsPage : UserControl
         {
             Placement = PlacementMode.Bottom,
             PlacementTarget = sender as Button,
-            Child = new Panel
+            Child = new StackPanel
             {
-                Margin = new Thickness(10), Children = { closeButton }
+                Spacing = 10,
+                Margin = new Thickness(10),
+                Orientation = Orientation.Vertical,
+                Children =
+                {
+                    new TextBox
+                    {
+                        Width = 100,
+                        Text = "Some text", 
+                    }, 
+                    new TextBox
+                    {
+                        Width = 100,
+                        Text = "Some other text", 
+                    }, 
+                    closeButton
+                }
             },
             IsLightDismissEnabled = false,
-            IsOpen = true
         };
+
+        LogicalChildren.Add(_popup);
+        _popup.IsOpen = true;
     }
 
     private void ButtonTopMostPopupStaysOpen(object sender, RoutedEventArgs e)
diff --git a/src/Windows/Avalonia.Win32/PopupImpl.cs b/src/Windows/Avalonia.Win32/PopupImpl.cs
index 4a3dae4fa7..111523f1c1 100644
--- a/src/Windows/Avalonia.Win32/PopupImpl.cs
+++ b/src/Windows/Avalonia.Win32/PopupImpl.cs
@@ -83,6 +83,10 @@ namespace Avalonia.Win32
                     _maxAutoSize = null;
                     goto default;
                 case UnmanagedMethods.WindowsMessage.WM_MOUSEACTIVATE:
+                    if (_parent?.Handle is not null)
+                    {
+                        UnmanagedMethods.SetFocus(_parent.Handle.Handle);
+                    }
                     return (IntPtr)UnmanagedMethods.MouseActivate.MA_NOACTIVATE;
                 default:
                     return base.WndProc(hWnd, msg, wParam, lParam);

From 03243f96e6140bfa239e566305d772eee80ed73d Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 27 Jan 2025 17:07:00 -0800
Subject: [PATCH 05/17] Move PopupsPage to IntegrationTestApp

---
 samples/ControlCatalog/MainView.xaml                  |  3 ---
 samples/IntegrationTestApp/MainWindow.axaml.cs        |  1 +
 .../Pages/PopupsPage.axaml}                           |  6 +++---
 .../Pages/PopupsPage.axaml.cs}                        | 11 +++--------
 4 files changed, 7 insertions(+), 14 deletions(-)
 rename samples/{ControlCatalog/Pages/PopupsPage.xaml => IntegrationTestApp/Pages/PopupsPage.axaml} (82%)
 rename samples/{ControlCatalog/Pages/PopupsPage.xaml.cs => IntegrationTestApp/Pages/PopupsPage.axaml.cs} (94%)

diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index d86d2a98e6..e3eed5fb0e 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -139,9 +139,6 @@
       <TabItem Header="Pointers">
         <pages:PointersPage />
       </TabItem>
-      <TabItem Header="Popups">
-        <pages:PopupsPage />
-      </TabItem>
       <TabItem Header="ProgressBar">
         <pages:ProgressBarPage />
       </TabItem>
diff --git a/samples/IntegrationTestApp/MainWindow.axaml.cs b/samples/IntegrationTestApp/MainWindow.axaml.cs
index ee7c81bf22..f8b38796e9 100644
--- a/samples/IntegrationTestApp/MainWindow.axaml.cs
+++ b/samples/IntegrationTestApp/MainWindow.axaml.cs
@@ -93,6 +93,7 @@ namespace IntegrationTestApp
                 new("Slider", () => new SliderPage()),
                 new("Window Decorations", () => new WindowDecorationsPage()),
                 new("Window", () => new WindowPage()),
+                new("Popups", () => new PopupsPage()),
             ];
         }
     }
diff --git a/samples/ControlCatalog/Pages/PopupsPage.xaml b/samples/IntegrationTestApp/Pages/PopupsPage.axaml
similarity index 82%
rename from samples/ControlCatalog/Pages/PopupsPage.xaml
rename to samples/IntegrationTestApp/Pages/PopupsPage.axaml
index 2dedb0e019..73ba77c663 100644
--- a/samples/ControlCatalog/Pages/PopupsPage.xaml
+++ b/samples/IntegrationTestApp/Pages/PopupsPage.axaml
@@ -1,6 +1,6 @@
-<UserControl x:Class="ControlCatalog.Pages.PopupsPage"
-             xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="IntegrationTestApp.Pages.PopupsPage">
   
   <StackPanel Orientation="Vertical" Spacing="10">
     
diff --git a/samples/ControlCatalog/Pages/PopupsPage.xaml.cs b/samples/IntegrationTestApp/Pages/PopupsPage.axaml.cs
similarity index 94%
rename from samples/ControlCatalog/Pages/PopupsPage.xaml.cs
rename to samples/IntegrationTestApp/Pages/PopupsPage.axaml.cs
index 2b9449b0cf..d367ab0238 100644
--- a/samples/ControlCatalog/Pages/PopupsPage.xaml.cs
+++ b/samples/IntegrationTestApp/Pages/PopupsPage.axaml.cs
@@ -7,21 +7,16 @@ using Avalonia.Layout;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 
-namespace ControlCatalog.Pages;
+namespace IntegrationTestApp.Pages;
 
-public class PopupsPage : UserControl
+public partial class PopupsPage : UserControl
 {
     private Popup? _popup;
     private Popup? _topMostPopup;
+
     public PopupsPage()
     {
         InitializeComponent();
-
-    }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
     }
 
     private void ButtonLightDismiss_OnClick(object sender, RoutedEventArgs e)

From 7d3ae3e5e2f0c03eec2369cad5e9a102b6629326 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 27 Jan 2025 18:42:58 -0800
Subject: [PATCH 06/17] Move Popup code to the XAML, making visual/logical
 management implicit

---
 .../IntegrationTestApp/Pages/PopupsPage.axaml | 58 ++++++++++--
 .../Pages/PopupsPage.axaml.cs                 | 94 ++++---------------
 2 files changed, 70 insertions(+), 82 deletions(-)

diff --git a/samples/IntegrationTestApp/Pages/PopupsPage.axaml b/samples/IntegrationTestApp/Pages/PopupsPage.axaml
index 73ba77c663..494133c2fe 100644
--- a/samples/IntegrationTestApp/Pages/PopupsPage.axaml
+++ b/samples/IntegrationTestApp/Pages/PopupsPage.axaml
@@ -1,18 +1,64 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="IntegrationTestApp.Pages.PopupsPage">
-  
+
   <StackPanel Orientation="Vertical" Spacing="10">
-    
+
     <TextBlock Text="'Light Dismiss' Popup" />
-    <Button Content="Show Popup" Click="ButtonLightDismiss_OnClick" />
+    <Button x:Name="ShowLightDismissPopup"
+            Content="Show Popup" Click="ButtonLightDismiss_OnClick" />
+    <Popup x:Name="LightDismissPopup"
+           PlacementTarget="ShowLightDismissPopup"
+           Placement="Bottom"
+           IsLightDismissEnabled="True">
+      <Panel Background="Gray"
+             Margin="10"
+             MinWidth="100"
+             MinHeight="30">
+        <TextBox Text="Popup Content"
+                 Name="LightDismissPopupContent" />
+      </Panel>
+    </Popup>
 
     <TextBlock Text="Popup that stays open" />
-    <Button Content="Show Popup" Click="ButtonPopupStaysOpen_OnClick" />
+    <Button x:Name="ShowStaysOpenPopup"
+            Content="Show Popup" Click="ButtonPopupStaysOpen_OnClick" />
+    <Popup x:Name="StaysOpenPopup"
+           PlacementTarget="ShowStaysOpenPopup"
+           Placement="Bottom"
+           IsLightDismissEnabled="False">
+      <StackPanel Background="Gray"
+                  MinWidth="100"
+                  MinHeight="30"
+                  Orientation="Vertical">
+        <TextBox Name="StaysOpenTextBox"
+                 Width="100"
+                 Text="Some text" />
+        <Button Name="StaysOpenPopupCloseButton"
+                Click="StaysOpenPopupCloseButton_OnClick"
+                Content="Click to Close" />
+      </StackPanel>
+    </Popup>
 
     <TextBlock Text="TopMost popup that stays open" />
-    <Button Content="Show Popup" Click="ButtonTopMostPopupStaysOpen" />
+    <Button x:Name="ShowTopMostPopup"
+            Content="Show Popup" Click="ButtonTopMostPopupStaysOpen" />
+    <Popup x:Name="TopMostPopup"
+           Placement="Top"
+           PlacementTarget="ShowTopMostPopup"
+           IsLightDismissEnabled="False"
+           Topmost="True">
+      <Panel MinWidth="100"
+             MinHeight="30">
+        <Button Name="TopMostPopupCloseButton"
+                Click="TopMostPopupCloseButton_OnClick"
+                Content="Click to Close" />
+      </Panel>
+    </Popup>
 
+    <Button x:Name="OpenNewWindowButton"
+            Content="Open Regular New Window"
+            Click="OpenRegularNewWindow_Click" />
   </StackPanel>
-  
+
 </UserControl>
diff --git a/samples/IntegrationTestApp/Pages/PopupsPage.axaml.cs b/samples/IntegrationTestApp/Pages/PopupsPage.axaml.cs
index d367ab0238..feca539d90 100644
--- a/samples/IntegrationTestApp/Pages/PopupsPage.axaml.cs
+++ b/samples/IntegrationTestApp/Pages/PopupsPage.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Automation;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Primitives.PopupPositioning;
@@ -11,9 +12,6 @@ namespace IntegrationTestApp.Pages;
 
 public partial class PopupsPage : UserControl
 {
-    private Popup? _popup;
-    private Popup? _topMostPopup;
-
     public PopupsPage()
     {
         InitializeComponent();
@@ -21,86 +19,30 @@ public partial class PopupsPage : UserControl
 
     private void ButtonLightDismiss_OnClick(object sender, RoutedEventArgs e)
     {
-        new Popup
-        {
-            Placement = PlacementMode.Bottom,
-            PlacementTarget = sender as Button,
-            Child = new Panel { Margin = new Thickness(10) ,Children = { new TextBlock { Text = "Popup Content" } }},
-            IsLightDismissEnabled = true,
-            IsOpen = true
-        };
+        LightDismissPopup.Open();
     }
 
     private void ButtonPopupStaysOpen_OnClick(object sender, RoutedEventArgs e)
     {
-        if (_popup is not null)
-            return;
-        
-        var closeButton = new Button { Content = "Click to Close" };
-        closeButton.Click += (o, args) =>
-        {
-            if (_popup is null)
-                return;
-            
-            LogicalChildren.Remove(_popup);
-            _popup.IsOpen = false;
-            _popup = null;
-        };
-        _popup = new Popup
-        {
-            Placement = PlacementMode.Bottom,
-            PlacementTarget = sender as Button,
-            Child = new StackPanel
-            {
-                Spacing = 10,
-                Margin = new Thickness(10),
-                Orientation = Orientation.Vertical,
-                Children =
-                {
-                    new TextBox
-                    {
-                        Width = 100,
-                        Text = "Some text", 
-                    }, 
-                    new TextBox
-                    {
-                        Width = 100,
-                        Text = "Some other text", 
-                    }, 
-                    closeButton
-                }
-            },
-            IsLightDismissEnabled = false,
-        };
-
-        LogicalChildren.Add(_popup);
-        _popup.IsOpen = true;
+        StaysOpenPopup.Open();
+    }
+    private void StaysOpenPopupCloseButton_OnClick(object? sender, RoutedEventArgs e)
+    {
+        StaysOpenPopup.Close();
     }
 
     private void ButtonTopMostPopupStaysOpen(object sender, RoutedEventArgs e)
     {
-        if (_topMostPopup is not null)
-            return;
-        
-        var closeButton = new Button { Content = "Click to Close" };
-        closeButton.Click += (o, args) =>
-        {
-            if (_topMostPopup is null)
-                return;
-            _topMostPopup.IsOpen = false;
-            _topMostPopup = null;
-        };
-        _topMostPopup = new Popup
-        {
-            Placement = PlacementMode.Bottom,
-            PlacementTarget = sender as Button,
-            Child = new Panel
-            {
-                Margin = new Thickness(10), Children = { closeButton }
-            },
-            IsLightDismissEnabled = false,
-            Topmost = true,
-            IsOpen = true
-        };
+        TopMostPopup.Open();
+    }
+    private void TopMostPopupCloseButton_OnClick(object? sender, RoutedEventArgs e)
+    {
+        TopMostPopup.Close();
+    }
+
+    private void OpenRegularNewWindow_Click(object? sender, RoutedEventArgs e)
+    {
+        var newWindow = new ShowWindowTest();
+        newWindow.Show((Window)TopLevel.GetTopLevel(this)!);
     }
 }

From 895f2ed2e2fd49130f7ab5e22c91d121c38a8530 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 27 Jan 2025 18:43:07 -0800
Subject: [PATCH 07/17] Add popup integration tests

---
 .../PopupsTests.cs                            | 203 ++++++++++++++++++
 1 file changed, 203 insertions(+)
 create mode 100644 tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs

diff --git a/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs b/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs
new file mode 100644
index 0000000000..22ac00b775
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs
@@ -0,0 +1,203 @@
+using System.Threading;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Interactions;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium;
+
+[Collection("Default")]
+public abstract class PopupsTests : TestBase
+{
+    private readonly bool _isOverlayPopups;
+
+    protected PopupsTests(bool isOverlayPopups, DefaultAppFixture fixture) : base(fixture, "Popups")
+    {
+        _isOverlayPopups = isOverlayPopups;
+    }
+
+    [Fact]
+    public void LightDismiss_Popup_Should_Open_And_Close()
+    {
+        // Open popup
+        var button = Session.FindElementByAccessibilityId("ShowLightDismissPopup");
+        button.Click();
+        Thread.Sleep(500);
+
+        // Assert - Popup is visible
+        Assert.NotNull(Session.FindElementByAccessibilityId("LightDismissPopupContent"));
+        
+        // Act - Click outside to dismiss
+        new Actions(Session)
+            .MoveByOffset(0, 500) // Move far away from popup
+            .Click()
+            .Perform();
+
+        Thread.Sleep(500);
+
+        // Assert - Popup is closed
+        Assert.Throws<WebDriverException>(() =>
+            Session.FindElementByAccessibilityId("LightDismissPopupContent"));
+    }
+
+    [Fact]
+    public void StaysOpen_Popup_Should_Stay_Open()
+    {
+        // Open popup
+        var button = Session.FindElementByAccessibilityId("ShowStaysOpenPopup");
+        button.Click();
+        Thread.Sleep(500);
+
+        try
+        {
+            // Assert - Popup is visible
+            Assert.NotNull(Session.FindElementByAccessibilityId("StaysOpenPopupCloseButton"));
+
+            // Act - Click outside
+            new Actions(Session)
+                .MoveByOffset(0, 500)
+                .Click()
+                .Perform();
+
+            Thread.Sleep(500);
+
+            // Assert - Popup is still visible
+            Assert.NotNull(Session.FindElementByAccessibilityId("StaysOpenPopupCloseButton"));
+
+        }
+        finally
+        {
+            // Act - Close popup with button
+            Session.FindElementByAccessibilityId("StaysOpenPopupCloseButton").Click();
+
+            Thread.Sleep(400);
+
+            // Assert - Popup is closed
+            Assert.Throws<WebDriverException>(() =>
+                Session.FindElementByAccessibilityId("StaysOpenPopupCloseButton"));
+        }
+    }
+
+    [Fact]
+    public void StaysOpen_Popup_TextBox_Should_Be_Editable()
+    {
+        // Open popup
+        var button = Session.FindElementByAccessibilityId("ShowStaysOpenPopup");
+        button.Click();
+        Thread.Sleep(500);
+
+        try
+        {
+            // Find and edit the TextBox
+            var textBox = Session.FindElementByAccessibilityId("StaysOpenTextBox");
+            textBox.Clear();
+            textBox.SendKeys("New text value");
+            Thread.Sleep(500);
+
+            // Verify text was changed
+            Assert.Equal("New text value", textBox.Text);
+        }
+        finally
+        {
+            // Cleanup - close popup
+            Session.FindElementByAccessibilityId("StaysOpenPopupCloseButton").Click();
+        }
+    }
+
+    [Fact]
+    public void TopMost_Popup_Should_Stay_Above_Other_Windows()
+    {
+        // It's not possible to test overlay topmost with other windows.
+        if (_isOverlayPopups)
+        {
+            return;
+        }
+
+        var staysOpenPopup = Session.FindElementByAccessibilityId("ShowTopMostPopup");
+        var mainWindowHandle = Session.CurrentWindowHandle;
+
+        // Show topmost popup.
+        staysOpenPopup.Click();
+        Assert.NotNull(Session.FindElementByAccessibilityId("TopMostPopupCloseButton"));
+
+        var hasClosedPopup = false;
+
+        try
+        {
+            // Open a child window.
+            using var _ = Session.FindElementByAccessibilityId("OpenNewWindowButton").OpenWindowWithClick();
+            Thread.Sleep(500);
+
+            // Force window to front by maximizing child window.
+            Session.FindElementByAccessibilityId("CurrentWindowState").SendClick();
+            Session.FindElementByAccessibilityId("WindowStateMaximized").SendClick();
+
+            // Switch back to the mainwindow context and verify tooltip is still accessible.
+            Session.SwitchTo().Window(mainWindowHandle);
+            Assert.NotNull(Session.FindElementByAccessibilityId("TopMostPopupCloseButton"));
+
+            // Verify we can still interact with the popup by closing it via button.
+            Session.FindElementByAccessibilityId("TopMostPopupCloseButton").Click();
+
+            // Verify popup closed
+            Assert.Throws<WebDriverException>(() =>
+                Session.FindElementByAccessibilityId("TopMostPopupCloseButton"));
+            hasClosedPopup = true;
+        }
+        finally
+        {
+            if (!hasClosedPopup)
+            {
+                Session.FindElementByAccessibilityId("TopMostPopupCloseButton").Click();
+            }
+        }
+    }
+
+    [Fact]
+    public void Non_TopMost_Popup_Does_Not_Stay_Above_Other_Windows()
+    {
+        var topmostButton = Session.FindElementByAccessibilityId("ShowStaysOpenPopup");
+        var mainWindowHandle = Session.CurrentWindowHandle;
+
+        // Show topmost popup.
+        topmostButton.Click();
+        Assert.NotNull(Session.FindElementByAccessibilityId("StaysOpenPopupCloseButton"));
+
+        try
+        {
+            // Open a child window.
+            var newWindowButton = Session.FindElementByAccessibilityId("OpenNewWindowButton");
+            using var _ = newWindowButton.OpenWindowWithClick();
+
+            // Force window to front by maximizing child window.
+            Session.FindElementByAccessibilityId("CurrentWindowState").SendClick();
+            Session.FindElementByAccessibilityId("WindowStateMaximized").SendClick();
+
+            // Switch back to the mainwindow context and verify tooltip is still accessible.
+            Session.SwitchTo().Window(mainWindowHandle);
+            Assert.NotNull(Session.FindElementByAccessibilityId("StaysOpenPopupCloseButton"));
+
+            // Verify we cannot interact with the popup by attempting closing it via button.
+            Session.FindElementByAccessibilityId("StaysOpenPopupCloseButton").Click();
+
+            // Verify popup is still accessible.
+            Assert.NotNull(Session.FindElementByAccessibilityId("StaysOpenPopupCloseButton"));
+        }
+        finally
+        {
+            // At this point secondary window should be already closed. And safe to close the popup.
+            Session.FindElementByAccessibilityId("StaysOpenPopupCloseButton").Click();
+        }
+    }
+
+    [Collection("Default")]
+    public class Default : PopupsTests
+    {
+        public Default(DefaultAppFixture fixture) : base(false, fixture) { }
+    }
+
+    [Collection("OverlayPopups")]
+    public class OverlayPopups : PopupsTests
+    {
+        public OverlayPopups(OverlayPopupsAppFixture fixture) : base(true, fixture) { }
+    }
+}

From 5fa6c551ef043438de0fd73afff5746762fddac3 Mon Sep 17 00:00:00 2001
From: Stefan Koell <stefan.koell@royalapps.com>
Date: Thu, 30 Jan 2025 11:24:41 +0100
Subject: [PATCH 08/17] Fix MenuTests+Default.Click_Grandchild by delaying
 popup activation

---
 samples/IntegrationTestApp/MainWindow.axaml.cs    | 2 +-
 samples/IntegrationTestApp/Pages/PopupsPage.axaml | 1 +
 src/Windows/Avalonia.Win32/PopupImpl.cs           | 9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/samples/IntegrationTestApp/MainWindow.axaml.cs b/samples/IntegrationTestApp/MainWindow.axaml.cs
index f8b38796e9..746539de71 100644
--- a/samples/IntegrationTestApp/MainWindow.axaml.cs
+++ b/samples/IntegrationTestApp/MainWindow.axaml.cs
@@ -87,13 +87,13 @@ namespace IntegrationTestApp
                 new("ListBox", () => new ListBoxPage()),
                 new("Menu", () => new MenuPage()),
                 new("Pointer", () => new PointerPage()),
+                new("Popups", () => new PopupsPage()),
                 new("RadioButton", () => new RadioButtonPage()),
                 new("Screens", () => new ScreensPage()),
                 new("ScrollBar", () => new ScrollBarPage()),
                 new("Slider", () => new SliderPage()),
                 new("Window Decorations", () => new WindowDecorationsPage()),
                 new("Window", () => new WindowPage()),
-                new("Popups", () => new PopupsPage()),
             ];
         }
     }
diff --git a/samples/IntegrationTestApp/Pages/PopupsPage.axaml b/samples/IntegrationTestApp/Pages/PopupsPage.axaml
index 494133c2fe..e473e82b3b 100644
--- a/samples/IntegrationTestApp/Pages/PopupsPage.axaml
+++ b/samples/IntegrationTestApp/Pages/PopupsPage.axaml
@@ -30,6 +30,7 @@
       <StackPanel Background="Gray"
                   MinWidth="100"
                   MinHeight="30"
+                  Spacing="20"
                   Orientation="Vertical">
         <TextBox Name="StaysOpenTextBox"
                  Width="100"
diff --git a/src/Windows/Avalonia.Win32/PopupImpl.cs b/src/Windows/Avalonia.Win32/PopupImpl.cs
index 111523f1c1..8897773a2f 100644
--- a/src/Windows/Avalonia.Win32/PopupImpl.cs
+++ b/src/Windows/Avalonia.Win32/PopupImpl.cs
@@ -1,7 +1,10 @@
 using System;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Primitives.PopupPositioning;
+using Avalonia.Input;
 using Avalonia.Platform;
+using Avalonia.Threading;
 using Avalonia.Win32.Interop;
 
 namespace Avalonia.Win32
@@ -83,10 +86,10 @@ namespace Avalonia.Win32
                     _maxAutoSize = null;
                     goto default;
                 case UnmanagedMethods.WindowsMessage.WM_MOUSEACTIVATE:
-                    if (_parent?.Handle is not null)
+                    Dispatcher.UIThread.Invoke(() =>
                     {
-                        UnmanagedMethods.SetFocus(_parent.Handle.Handle);
-                    }
+                        _parent?.Activate();
+                    }, DispatcherPriority.Background);
                     return (IntPtr)UnmanagedMethods.MouseActivate.MA_NOACTIVATE;
                 default:
                     return base.WndProc(hWnd, msg, wParam, lParam);

From 19e37d983af7d98a7a92d1387496bca12e74fab3 Mon Sep 17 00:00:00 2001
From: Stefan Koell <stefan.koell@royalapps.com>
Date: Fri, 7 Feb 2025 15:04:54 +0100
Subject: [PATCH 09/17] Kill input focus when input element on popup is focused
 element

---
 src/Avalonia.Controls/TopLevel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 62c860c7a9..585bef5323 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -917,7 +917,7 @@ namespace Avalonia.Controls
             while (focused.VisualParent != null)
                 focused = focused.VisualParent;
 
-            if (focused == this)
+            if (focused == this || GetTopLevel(focused) == focused)
                 KeyboardDevice.Instance?.SetFocusedElement(null, NavigationMethod.Unspecified, KeyModifiers.None);
         }
 

From cf77e5fb5419712038c23eeb6cd1eda48b87b254 Mon Sep 17 00:00:00 2001
From: Stefan Koell <stefan.koell@royalapps.com>
Date: Tue, 10 Jun 2025 15:09:39 +0200
Subject: [PATCH 10/17] try to fix tests

---
 samples/IntegrationTestApp/Pages/PopupsPage.axaml    |  5 ++++-
 .../Avalonia.IntegrationTests.Appium/PopupsTests.cs  | 12 ++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/samples/IntegrationTestApp/Pages/PopupsPage.axaml b/samples/IntegrationTestApp/Pages/PopupsPage.axaml
index e473e82b3b..812b5681f9 100644
--- a/samples/IntegrationTestApp/Pages/PopupsPage.axaml
+++ b/samples/IntegrationTestApp/Pages/PopupsPage.axaml
@@ -4,7 +4,10 @@
 
   <StackPanel Orientation="Vertical" Spacing="10">
 
-    <TextBlock Text="'Light Dismiss' Popup" />
+    <Border x:Name="DismissBorder">
+      <TextBlock Text="'Light Dismiss' Popup" />
+    </Border>
+    
     <Button x:Name="ShowLightDismissPopup"
             Content="Show Popup" Click="ButtonLightDismiss_OnClick" />
     <Popup x:Name="LightDismissPopup"
diff --git a/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs b/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs
index 22ac00b775..24fe87cde1 100644
--- a/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs
@@ -27,10 +27,8 @@ public abstract class PopupsTests : TestBase
         Assert.NotNull(Session.FindElementByAccessibilityId("LightDismissPopupContent"));
         
         // Act - Click outside to dismiss
-        new Actions(Session)
-            .MoveByOffset(0, 500) // Move far away from popup
-            .Click()
-            .Perform();
+        var dismissBorder = Session.FindElementByAccessibilityId("DismissBorder");
+        dismissBorder.Click();
 
         Thread.Sleep(500);
 
@@ -53,10 +51,8 @@ public abstract class PopupsTests : TestBase
             Assert.NotNull(Session.FindElementByAccessibilityId("StaysOpenPopupCloseButton"));
 
             // Act - Click outside
-            new Actions(Session)
-                .MoveByOffset(0, 500)
-                .Click()
-                .Perform();
+            var dismissBorder = Session.FindElementByAccessibilityId("DismissBorder");
+            dismissBorder.Click();
 
             Thread.Sleep(500);
 

From b1d66f0a55a216b721bda115d4cc03bda88c52a2 Mon Sep 17 00:00:00 2001
From: Stefan Koell <stefan.koell@royalapps.com>
Date: Tue, 10 Jun 2025 16:03:21 +0200
Subject: [PATCH 11/17] try to fix test v2

---
 samples/IntegrationTestApp/Pages/PopupsPage.axaml     | 9 +++++----
 tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/samples/IntegrationTestApp/Pages/PopupsPage.axaml b/samples/IntegrationTestApp/Pages/PopupsPage.axaml
index 812b5681f9..58ee76f2a0 100644
--- a/samples/IntegrationTestApp/Pages/PopupsPage.axaml
+++ b/samples/IntegrationTestApp/Pages/PopupsPage.axaml
@@ -4,10 +4,11 @@
 
   <StackPanel Orientation="Vertical" Spacing="10">
 
-    <Border x:Name="DismissBorder">
-      <TextBlock Text="'Light Dismiss' Popup" />
-    </Border>
-    
+    <Button x:Name="DismissButton"
+            Content="Dismiss Button" />
+
+    <TextBlock Text="'Light Dismiss' Popup" />
+
     <Button x:Name="ShowLightDismissPopup"
             Content="Show Popup" Click="ButtonLightDismiss_OnClick" />
     <Popup x:Name="LightDismissPopup"
diff --git a/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs b/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs
index 24fe87cde1..ead62746c5 100644
--- a/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs
@@ -27,7 +27,7 @@ public abstract class PopupsTests : TestBase
         Assert.NotNull(Session.FindElementByAccessibilityId("LightDismissPopupContent"));
         
         // Act - Click outside to dismiss
-        var dismissBorder = Session.FindElementByAccessibilityId("DismissBorder");
+        var dismissBorder = Session.FindElementByAccessibilityId("DismissButton");
         dismissBorder.Click();
 
         Thread.Sleep(500);
@@ -51,7 +51,7 @@ public abstract class PopupsTests : TestBase
             Assert.NotNull(Session.FindElementByAccessibilityId("StaysOpenPopupCloseButton"));
 
             // Act - Click outside
-            var dismissBorder = Session.FindElementByAccessibilityId("DismissBorder");
+            var dismissBorder = Session.FindElementByAccessibilityId("DismissButton");
             dismissBorder.Click();
 
             Thread.Sleep(500);

From d3b77940f9cd83d9e271a9d45e035c9164ca222b Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Thu, 12 Jun 2025 19:04:28 +0200
Subject: [PATCH 12/17] Integration tests: ensure menus get closed after
 testing

---
 .../MenuTests.cs                                 | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs b/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
index 6fd9505583..781c12976c 100644
--- a/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
@@ -1,11 +1,12 @@
-using OpenQA.Selenium;
+using System;
+using OpenQA.Selenium;
 using OpenQA.Selenium.Interactions;
 using Xunit;
 
 namespace Avalonia.IntegrationTests.Appium
 {
     [Collection("Default")]
-    public abstract class MenuTests : TestBase
+    public abstract class MenuTests : TestBase, IDisposable
     {
         public MenuTests(DefaultAppFixture fixture)
             : base(fixture, "Menu")
@@ -17,11 +18,18 @@ namespace Avalonia.IntegrationTests.Appium
             Assert.Equal("None", clickedMenuItem.Text);
         }
 
+        public void Dispose()
+        {
+            // Click the reset button so that any menu still open gets closed
+            var reset = Session.FindElementByAccessibilityId("MenuClickedMenuItemReset");
+            reset?.Click();
+        }
+
         [Fact]
         public void Click_Child()
         {
             var rootMenuItem = Session.FindElementByAccessibilityId("RootMenuItem");
-            
+
             rootMenuItem.SendClick();
 
             var childMenuItem = Session.FindElementByAccessibilityId("Child1MenuItem");
@@ -35,7 +43,7 @@ namespace Avalonia.IntegrationTests.Appium
         public void Click_Grandchild()
         {
             var rootMenuItem = Session.FindElementByAccessibilityId("RootMenuItem");
-            
+
             rootMenuItem.SendClick();
 
             var childMenuItem = Session.FindElementByAccessibilityId("Child2MenuItem");

From b76d286c751059369f1a23d87cffbfe955123d6c Mon Sep 17 00:00:00 2001
From: stefankoell <stefan.koell@code4ward.net>
Date: Fri, 13 Jun 2025 12:44:38 +0200
Subject: [PATCH 13/17] run popup tests only on windows

---
 tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs b/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs
index ead62746c5..98f6bc804d 100644
--- a/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/PopupsTests.cs
@@ -15,7 +15,7 @@ public abstract class PopupsTests : TestBase
         _isOverlayPopups = isOverlayPopups;
     }
 
-    [Fact]
+    [PlatformFact(TestPlatforms.Windows)]
     public void LightDismiss_Popup_Should_Open_And_Close()
     {
         // Open popup
@@ -37,7 +37,7 @@ public abstract class PopupsTests : TestBase
             Session.FindElementByAccessibilityId("LightDismissPopupContent"));
     }
 
-    [Fact]
+    [PlatformFact(TestPlatforms.Windows)]
     public void StaysOpen_Popup_Should_Stay_Open()
     {
         // Open popup
@@ -73,7 +73,7 @@ public abstract class PopupsTests : TestBase
         }
     }
 
-    [Fact]
+    [PlatformFact(TestPlatforms.Windows)]
     public void StaysOpen_Popup_TextBox_Should_Be_Editable()
     {
         // Open popup
@@ -99,7 +99,7 @@ public abstract class PopupsTests : TestBase
         }
     }
 
-    [Fact]
+    [PlatformFact(TestPlatforms.Windows)]
     public void TopMost_Popup_Should_Stay_Above_Other_Windows()
     {
         // It's not possible to test overlay topmost with other windows.
@@ -148,7 +148,7 @@ public abstract class PopupsTests : TestBase
         }
     }
 
-    [Fact]
+    [PlatformFact(TestPlatforms.Windows)]
     public void Non_TopMost_Popup_Does_Not_Stay_Above_Other_Windows()
     {
         var topmostButton = Session.FindElementByAccessibilityId("ShowStaysOpenPopup");

From 6847a03570e643d6205802e6aae883d60755a909 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Fri, 4 Jul 2025 15:57:33 +0200
Subject: [PATCH 14/17] WIP: Removing the hack to see if anything changes.

---
 src/Windows/Avalonia.Win32/PopupImpl.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/PopupImpl.cs b/src/Windows/Avalonia.Win32/PopupImpl.cs
index 8897773a2f..a2faf5bf7e 100644
--- a/src/Windows/Avalonia.Win32/PopupImpl.cs
+++ b/src/Windows/Avalonia.Win32/PopupImpl.cs
@@ -86,10 +86,7 @@ namespace Avalonia.Win32
                     _maxAutoSize = null;
                     goto default;
                 case UnmanagedMethods.WindowsMessage.WM_MOUSEACTIVATE:
-                    Dispatcher.UIThread.Invoke(() =>
-                    {
-                        _parent?.Activate();
-                    }, DispatcherPriority.Background);
+                    _parent?.Activate();
                     return (IntPtr)UnmanagedMethods.MouseActivate.MA_NOACTIVATE;
                 default:
                     return base.WndProc(hWnd, msg, wParam, lParam);

From 7292c0933ff7f0005bfeb5b6503100ead10a4405 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Fri, 4 Jul 2025 16:25:17 +0200
Subject: [PATCH 15/17] WIP: Removing the second hack.

I'm guessing this will fix it.
---
 src/Windows/Avalonia.Win32/PopupImpl.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/PopupImpl.cs b/src/Windows/Avalonia.Win32/PopupImpl.cs
index a2faf5bf7e..400a9f2b1c 100644
--- a/src/Windows/Avalonia.Win32/PopupImpl.cs
+++ b/src/Windows/Avalonia.Win32/PopupImpl.cs
@@ -86,7 +86,6 @@ namespace Avalonia.Win32
                     _maxAutoSize = null;
                     goto default;
                 case UnmanagedMethods.WindowsMessage.WM_MOUSEACTIVATE:
-                    _parent?.Activate();
                     return (IntPtr)UnmanagedMethods.MouseActivate.MA_NOACTIVATE;
                 default:
                     return base.WndProc(hWnd, msg, wParam, lParam);

From 5c22c752fa27a3293ad504bda840a2f1d035010d Mon Sep 17 00:00:00 2001
From: Stefan Koell <stefan.koell@royalapps.com>
Date: Tue, 8 Jul 2025 11:46:14 +0200
Subject: [PATCH 16/17] fix to make transparent window integration app work on
 macOS

---
 src/Avalonia.Controls/Primitives/PopupRoot.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index 38c81ee4af..7113fd7c5d 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -61,7 +61,6 @@ namespace Avalonia.Controls.Primitives
         {
             ParentTopLevel = parent;
             impl.SetWindowManagerAddShadowHint(WindowManagerAddShadowHint);
-            impl.SetTopmost(Topmost);
         }
 
         /// <summary>
@@ -228,7 +227,7 @@ namespace Avalonia.Controls.Primitives
             }
             else if (change.Property == TopmostProperty)
             {
-                PlatformImpl?.SetTopmost(Topmost);
+                PlatformImpl?.SetTopmost(change.GetNewValue<bool>());
             }
         }
     }

From bbc0f5a70154aec77947fd16a8ca033e714cf5ab Mon Sep 17 00:00:00 2001
From: stefankoell <stefan.koell@code4ward.net>
Date: Fri, 26 Dec 2025 13:01:36 +0100
Subject: [PATCH 17/17] fix menu tests

---
 .../MenuTests.cs                              | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs b/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
index 781c12976c..e2670d25e4 100644
--- a/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Interactions;
 using Xunit;
@@ -61,10 +62,12 @@ namespace Avalonia.IntegrationTests.Appium
         {
             MovePointerOutOfTheWay();
 
-            new Actions(Session)
-                .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
-                .SendKeys(Keys.Down + Keys.Enter)
-                .Perform();
+            var window = Session.FindElementByAccessibilityId("MainWindow");
+            window.Click();
+
+            window.SendKeys(Keys.LeftAlt);
+            Thread.Sleep(150);
+            window.SendKeys(Keys.Down + Keys.Enter);
 
             var clickedMenuItem = Session.FindElementByAccessibilityId("ClickedMenuItem");
             Assert.Equal("_Child 1", clickedMenuItem.Text);
@@ -75,10 +78,12 @@ namespace Avalonia.IntegrationTests.Appium
         {
             MovePointerOutOfTheWay();
 
-            new Actions(Session)
-                .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
-                .SendKeys(Keys.Down + Keys.Down + Keys.Right + Keys.Enter)
-                .Perform();
+            var window = Session.FindElementByAccessibilityId("MainWindow");
+            window.Click();
+
+            window.SendKeys(Keys.LeftAlt);
+            Thread.Sleep(150);
+            window.SendKeys(Keys.Down + Keys.Down + Keys.Right + Keys.Enter);
 
             var clickedMenuItem = Session.FindElementByAccessibilityId("ClickedMenuItem");
             Assert.Equal("_Grandchild", clickedMenuItem.Text);
@@ -89,10 +94,14 @@ namespace Avalonia.IntegrationTests.Appium
         {
             MovePointerOutOfTheWay();
 
-            new Actions(Session)
-                .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
-                .SendKeys("rc")
-                .Perform();
+            var window = Session.FindElementByAccessibilityId("MainWindow");
+            window.Click();
+
+            window.SendKeys(Keys.LeftAlt);
+            Thread.Sleep(150);
+            window.SendKeys("r");
+            Thread.Sleep(75);
+            window.SendKeys("c");
 
             var clickedMenuItem = Session.FindElementByAccessibilityId("ClickedMenuItem");
             Assert.Equal("_Child 1", clickedMenuItem.Text);
@@ -103,10 +112,16 @@ namespace Avalonia.IntegrationTests.Appium
         {
             MovePointerOutOfTheWay();
 
-            new Actions(Session)
-                .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
-                .SendKeys("rhg")
-                .Perform();
+            var window = Session.FindElementByAccessibilityId("MainWindow");
+            window.Click();
+
+            window.SendKeys(Keys.LeftAlt);
+            Thread.Sleep(150);
+            window.SendKeys("r");
+            Thread.Sleep(75);
+            window.SendKeys("h");
+            Thread.Sleep(75);
+            window.SendKeys("g");
 
             var clickedMenuItem = Session.FindElementByAccessibilityId("ClickedMenuItem");
             Assert.Equal("_Grandchild", clickedMenuItem.Text);