dont re-set topmost if window isn't the topmost

AvaloniaUI · Jun 24, 2024 · 593b1c2 · 593b1c2
1 parent a3de918
commit 593b1c2
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -853,18 +853,24 @@ public void SetTopmost(bool value)
                 return;
             }
 
-            _topmost = value;
+            IntPtr hWndInsertAfter = value ? WindowPosZOrder.HWND_TOPMOST : WindowPosZOrder.HWND_NOTOPMOST;
+            SetWindowPos(_hwnd,
+                hWndInsertAfter,
+                0, 0, 0, 0,
+                SetWindowPosFlags.SWP_NOMOVE | SetWindowPosFlags.SWP_NOSIZE | SetWindowPosFlags.SWP_NOACTIVATE);
 
-            EnsureTopmost();
+            _topmost = value;
         }
 
         private void EnsureTopmost()
         {
-            IntPtr hWndInsertAfter = _topmost ? WindowPosZOrder.HWND_TOPMOST : WindowPosZOrder.HWND_NOTOPMOST;
-            SetWindowPos(_hwnd,
-                hWndInsertAfter,
-                0, 0, 0, 0,
-                SetWindowPosFlags.SWP_NOMOVE | SetWindowPosFlags.SWP_NOSIZE | SetWindowPosFlags.SWP_NOACTIVATE);
+            if(_topmost)
+            {
+                SetWindowPos(_hwnd,
+                    WindowPosZOrder.HWND_TOPMOST,
+                    0, 0, 0, 0,
+                    SetWindowPosFlags.SWP_NOMOVE | SetWindowPosFlags.SWP_NOSIZE | SetWindowPosFlags.SWP_NOACTIVATE);
+            }
         }
 
         public unsafe void SetFrameThemeVariant(PlatformThemeVariant themeVariant)