AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

macos: restore key window after hiding popup

Browse Source 
This fixes the focus returning to the parent window after the popup has
been hidden in the form of being a "Key Window" in macOS.
This commit is contained in:
Christian Hergert 2022-02-16 18:26:59 -08:00
parent 493f90499b
commit b2de83efcb
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gdk/macos/gdkmacossurface.c
View File

@ -133,6 +133,7 @@ gdk_macos_surface_hide (GdkSurface *surface)
GdkMacosSurface *self = (GdkMacosSurface *)surface;
GdkSeat *seat;
gboolean was_mapped;
gboolean was_key;
g_assert (GDK_IS_MACOS_SURFACE (self));
@ -141,6 +142,7 @@ gdk_macos_surface_hide (GdkSurface *surface)
_gdk_macos_display_remove_frame_callback (GDK_MACOS_DISPLAY (surface->display), self);
was_mapped = GDK_SURFACE_IS_MAPPED (GDK_SURFACE (self));
was_key = [self->window isKeyWindow];
seat = gdk_display_get_default_seat (surface->display);
gdk_seat_ungrab (seat);
@ -151,6 +153,17 @@ gdk_macos_surface_hide (GdkSurface *surface)
g_clear_object (&self->buffer);
if (was_key)
{
/* Return key input to the parent window if necessary */
if (surface->parent != NULL && GDK_SURFACE_IS_MAPPED (surface->parent))
{
GdkMacosWindow *parentWindow = GDK_MACOS_SURFACE (surface->parent)->window;
[parentWindow showAndMakeKey:YES];
}
}
if (was_mapped)
gdk_surface_freeze_updates (GDK_SURFACE (self));
}