Merge branch 'bad-popup-extents' into 'main'

[x11] Fix coordinate space of rect in gdk_x11_surface_get_frame_extents when called on popups.

See merge request GNOME/gtk!4820
This commit is contained in:
Matthias Clasen 2022-06-23 11:59:55 +00:00
commit 0660bb834e

View File

@ -2793,14 +2793,19 @@ gdk_x11_surface_get_frame_extents (GdkSurface *surface,
impl = GDK_X11_SURFACE (surface); impl = GDK_X11_SURFACE (surface);
/* Refine our fallback answer a bit using local information */ /* Refine our fallback answer a bit using local information */
rect->x = impl->abs_x * impl->surface_scale; rect->x = impl->abs_x;
rect->y = impl->abs_y * impl->surface_scale; rect->y = impl->abs_y;
rect->width = surface->width * impl->surface_scale; rect->width = surface->width;
rect->height = surface->height * impl->surface_scale; rect->height = surface->height;
if (GDK_SURFACE_DESTROYED (surface) || impl->override_redirect) if (GDK_SURFACE_DESTROYED (surface) || impl->override_redirect)
return; return;
rect->x *= impl->surface_scale;
rect->y *= impl->surface_scale;
rect->width *= impl->surface_scale;
rect->height *= impl->surface_scale;
nvroots = 0; nvroots = 0;
vroots = NULL; vroots = NULL;