diff options
| author | Thomas Holder <thomas@thomas-holder.de> | 2021-01-19 09:31:00 +0100 |
|---|---|---|
| committer | Thomas Holder <thomas@thomas-holder.de> | 2021-01-19 09:31:00 +0100 |
| commit | 59806eee384bbd4ac277f39412a0c31e793d9b5c (patch) | |
| tree | 5c4ed3d87aae6596d299fe1ec6b5210e7a141054 | |
| parent | e6f0103940e2dbec15fb46138f936ab7400b80f8 (diff) | |
| download | gtk+-59806eee384bbd4ac277f39412a0c31e793d9b5c.tar.gz | |
macOS: fix #2436 raise transient window on focus
Ported from gtk-3-24 e278f3890540ad59eaccf32fd90fe49416e1f7f2
Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/2436
| -rw-r--r-- | gdk/macos/gdkmacosdisplay.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/gdk/macos/gdkmacosdisplay.c b/gdk/macos/gdkmacosdisplay.c index be2d111c59..ea07215794 100644 --- a/gdk/macos/gdkmacosdisplay.c +++ b/gdk/macos/gdkmacosdisplay.c @@ -547,6 +547,20 @@ _gdk_macos_display_surface_resigned_key (GdkMacosDisplay *self, _gdk_macos_display_clear_sorting (self); } +/* Raises a transient window. + */ +static void +raise_transient (GdkMacosSurface *surface) +{ + GdkMacosSurface *parent_surface = GDK_MACOS_SURFACE (GDK_SURFACE (surface)->transient_for); + + NSWindow *parent = _gdk_macos_surface_get_native (parent_surface); + NSWindow *window = _gdk_macos_surface_get_native (surface); + + [parent removeChildWindow:window]; + [parent addChildWindow:window ordered:NSWindowAbove]; +} + void _gdk_macos_display_surface_became_main (GdkMacosDisplay *self, GdkMacosSurface *surface) @@ -559,6 +573,9 @@ _gdk_macos_display_surface_became_main (GdkMacosDisplay *self, g_queue_push_head_link (&self->main_surfaces, &surface->main); + if (GDK_SURFACE (surface)->transient_for) + raise_transient (surface); + _gdk_macos_display_clear_sorting (self); } |