Merge branch 'bad-popup-extents-gtk3' into 'gtk-3-24'

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

See merge request GNOME/gtk!4821
This commit is contained in:
Matthias Clasen
2022-06-23 12:00:11 +00:00

View File

@ -3240,14 +3240,19 @@ gdk_x11_window_get_frame_extents (GdkWindow *window,
impl = GDK_WINDOW_IMPL_X11 (window->impl);
/* Refine our fallback answer a bit using local information */
rect->x = window->x * impl->window_scale;
rect->y = window->y * impl->window_scale;
rect->width = window->width * impl->window_scale;
rect->height = window->height * impl->window_scale;
rect->x = window->x;
rect->y = window->y;
rect->width = window->width;
rect->height = window->height;
if (GDK_WINDOW_DESTROYED (window) || impl->override_redirect)
return;
rect->x *= impl->window_scale;
rect->y *= impl->window_scale;
rect->width *= impl->window_scale;
rect->height *= impl->window_scale;
nvroots = 0;
vroots = NULL;