[gtk/win32.modal: 32/33] GDK/Win32: Only use SWP_NOOWNERZORDER on temp surfaces

[Chun-wei Fan <fanchunwei src gnome org>]

commit b05782fe106b2e96e419b2eb5149e9ad782d450a
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Oct 8 12:46:06 2020 +0800

    GDK/Win32: Only use SWP_NOOWNERZORDER on temp surfaces
    
    Forward port of commit Revert "GDK W32: Use SWP_NOOWNERZORDER everywhere it can
    be applied" by LRN, as this flag caused more issues in terms of maintaining
    Z-order
    
    Forward port of MR !1769

 gdk/win32/gdksurface-win32.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index 2ef43845b8..9ecbb6dbad 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -1001,7 +1001,7 @@ show_window_internal (GdkSurface *window,
       API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window),
                               (window->state & GDK_TOPLEVEL_STATE_ABOVE)?HWND_TOPMOST:HWND_NOTOPMOST,
                               0, 0, 0, 0,
-                              SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOOWNERZORDER));
+                              SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE));
     }
 }
 
@@ -1927,7 +1927,7 @@ _gdk_win32_surface_update_style_bits (GdkSurface *window)
   rect.right += after.right - before.right;
   rect.bottom += after.bottom - before.bottom;
 
-  flags = SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOREPOSITION | SWP_NOOWNERZORDER;
+  flags = SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOREPOSITION;
 
   if (will_be_topmost && !was_topmost)
     {
@@ -4260,7 +4260,7 @@ gdk_win32_surface_fullscreen (GdkSurface *window)
 
       API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window), HWND_TOP,
                 x, y, width, height,
-                SWP_NOCOPYBITS | SWP_SHOWWINDOW | SWP_NOOWNERZORDER));
+                SWP_NOCOPYBITS | SWP_SHOWWINDOW));
     }
 }
 
@@ -4284,7 +4284,7 @@ gdk_win32_surface_unfullscreen (GdkSurface *window)
       API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window), HWND_NOTOPMOST,
                               fi->r.left, fi->r.top,
                               fi->r.right - fi->r.left, fi->r.bottom - fi->r.top,
-                              SWP_NOCOPYBITS | SWP_SHOWWINDOW | SWP_NOOWNERZORDER));
+                              SWP_NOCOPYBITS | SWP_SHOWWINDOW));
 
       g_object_set_data (G_OBJECT (window), "fullscreen-info", NULL);
       g_free (fi);