Merge branch 'x11-input-setup-mess' into 'main'

x11: Cosmetics

Closes #6840

See merge request GNOME/gtk!7674
This commit is contained in:
Matthias Clasen 2024-08-31 16:57:55 +00:00
commit 074bcd33be

View File

@ -1483,10 +1483,13 @@ gdk_x11_display_open (const char *display_name)
* GL context.
*/
if (!gdk_display_prepare_gl (display, NULL))
{
if (!display_x11->leader_gdk_surface)
{
gdk_x11_display_query_default_visual (display_x11, &display_x11->window_visual, &display_x11->window_depth);
gdk_x11_display_init_leader_surface (display_x11);
}
}
#ifdef HAVE_XFIXES
if (XFixesQueryExtension (display_x11->xdisplay,
@ -3021,7 +3024,7 @@ gdk_x11_display_init_gl (GdkDisplay *display,
GdkX11Display *self = GDK_X11_DISPLAY (display);
if (!gdk_x11_display_init_gl_backend (self, &self->window_visual, &self->window_depth, error))
return FALSE;
return NULL;
gdk_x11_display_init_leader_surface (self);