From: Christian Hergert <christian@hergert.me>
Date: Thu, 10 Mar 2022 16:04:14 +0000 (-0800)
Subject: macos: make transient-for key window when hiding surface
X-Git-Tag: archive/raspbian/4.8.3+ds-2+rpi1~3^2~20^2~4^2~318^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=84014e3414b5eb35e16a2a993472bfd391fe7ee1;p=gtk4.git

macos: make transient-for key window when hiding surface

This only handled the popover case before and not the transient-for case.
---

diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c
index f6140deafa..168cdc4e67 100644
--- a/gdk/macos/gdkmacossurface.c
+++ b/gdk/macos/gdkmacossurface.c
@@ -219,10 +219,17 @@ gdk_macos_surface_hide (GdkSurface *surface)
 
   if (was_key)
     {
+      GdkSurface *parent;
+
+      if (GDK_IS_TOPLEVEL (surface))
+        parent = surface->transient_for;
+      else
+        parent = surface->parent;
+
       /* Return key input to the parent window if necessary */
-      if (surface->parent != NULL && GDK_SURFACE_IS_MAPPED (surface->parent))
+      if (parent != NULL && GDK_SURFACE_IS_MAPPED (parent))
         {
-          GdkMacosWindow *parentWindow = GDK_MACOS_SURFACE (surface->parent)->window;
+          GdkMacosWindow *parentWindow = GDK_MACOS_SURFACE (parent)->window;
 
           [parentWindow showAndMakeKey:YES];
         }