Merge branch 'wip/otte/for-master' into 'master'

x11: Don't try to move destroyed windows

See merge request GNOME/gtk!4054
This commit is contained in:
Benjamin Otte 2021-10-11 18:36:20 +00:00
commit d89e82d4a0

View File

@ -1926,8 +1926,13 @@ gdk_x11_surface_update_popups (GdkSurface *parent)
{
GdkX11Surface *popup_impl = l->data;
GdkSurface *popup = GDK_SURFACE (popup_impl);
int new_x = GDK_X11_SURFACE (parent)->abs_x + popup->x;
int new_y = GDK_X11_SURFACE (parent)->abs_y + popup->y;
int new_x, new_y;
if (GDK_SURFACE_DESTROYED (popup))
continue;
new_x = GDK_X11_SURFACE (parent)->abs_x + popup->x;
new_y = GDK_X11_SURFACE (parent)->abs_y + popup->y;
if (new_x != popup_impl->abs_x || new_y != popup_impl->abs_y)
x11_surface_move (popup, new_x, new_y);