From: Guido Günther <agx@sigxcpu.org>
Date: Wed, 25 Aug 2021 10:17:47 +0000 (+0200)
Subject: window: Make sure we call gdk_wayland_surface_focus
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~19^2~3^2~6^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c5da579cda3855ed78b6a2b43f8ca5ceab367596;p=gtk4.git

window: Make sure we call gdk_wayland_surface_focus

When using xdg_activation this is responsible for submitting
the activation token / startup id to the compositor.
---

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index c1673df637..a658471c12 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5271,14 +5271,15 @@ gtk_window_present_with_time (GtkWindow *window,
 #endif
 	    timestamp = gtk_get_current_event_time ();
         }
-
-      gdk_toplevel_focus (GDK_TOPLEVEL (surface), timestamp);
     }
   else
     {
       priv->initial_timestamp = timestamp;
       gtk_widget_show (widget);
     }
+
+  g_assert (priv->surface != NULL);
+  gdk_toplevel_focus (GDK_TOPLEVEL (priv->surface), timestamp);
 }
 
 /**