summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2021-08-25 12:17:47 +0200
committerCarlos Garnacho <carlosg@gnome.org>2022-03-16 19:50:21 +0100
commitc5da579cda3855ed78b6a2b43f8ca5ceab367596 (patch)
tree47a7b35acd8ea0848ffd4773d6b537b1973df115
parent38bbcb74115b69263a63fae3a70bc6c11e701814 (diff)
downloadgtk+-c5da579cda3855ed78b6a2b43f8ca5ceab367596.tar.gz
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.
-rw-r--r--gtk/gtkwindow.c5
1 files changed, 3 insertions, 2 deletions
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);
}
/**