Merge branch 'fix-wayland-glitching-v2' into 'main'

gdk/wayland: freeze popups when hidden 2

See merge request GNOME/gtk!4712
This commit is contained in:
Matthias Clasen 2022-05-10 19:32:16 +00:00
commit 9536eb654b

View File

@ -113,6 +113,7 @@ struct _GdkWaylandSurface
PopupState popup_state; PopupState popup_state;
unsigned int popup_thaw_upon_show : 1;
unsigned int initial_configure_received : 1; unsigned int initial_configure_received : 1;
unsigned int has_uncommitted_ack_configure : 1; unsigned int has_uncommitted_ack_configure : 1;
unsigned int mapped : 1; unsigned int mapped : 1;
@ -2984,6 +2985,9 @@ gdk_wayland_surface_hide_surface (GdkSurface *surface)
if (GDK_IS_POPUP (surface)) if (GDK_IS_POPUP (surface))
{ {
impl->popup_thaw_upon_show = TRUE;
gdk_surface_freeze_updates (surface);
switch (impl->popup_state) switch (impl->popup_state)
{ {
case POPUP_STATE_WAITING_FOR_REPOSITIONED: case POPUP_STATE_WAITING_FOR_REPOSITIONED:
@ -3223,6 +3227,12 @@ show_popup (GdkSurface *surface,
if (!impl->display_server.wl_surface) if (!impl->display_server.wl_surface)
gdk_wayland_surface_create_surface (surface); gdk_wayland_surface_create_surface (surface);
if (impl->popup_thaw_upon_show)
{
impl->popup_thaw_upon_show = FALSE;
gdk_surface_thaw_updates (surface);
}
gdk_wayland_surface_map_popup (surface, width, height, layout); gdk_wayland_surface_map_popup (surface, width, height, layout);
} }