mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-28 22:41:43 +00:00
Merge branch 'wip/reset-repositioned-after-handling' into 'main'
wayland/popup: Handle late received reposition feedback See merge request GNOME/gtk!5735
This commit is contained in:
commit
f002e23a37
@ -398,7 +398,11 @@ gdk_wayland_popup_handle_configure (GdkWaylandSurface *wayland_surface)
|
||||
g_warn_if_reached ();
|
||||
|
||||
if (wayland_popup->pending.has_repositioned_token)
|
||||
wayland_popup->received_reposition_token = wayland_popup->pending.repositioned_token;
|
||||
{
|
||||
wayland_popup->received_reposition_token =
|
||||
wayland_popup->pending.repositioned_token;
|
||||
wayland_popup->pending.has_repositioned_token = FALSE;
|
||||
}
|
||||
|
||||
switch (wayland_popup->state)
|
||||
{
|
||||
@ -968,6 +972,9 @@ gdk_wayland_surface_create_xdg_popup (GdkWaylandPopup *wayland_popup,
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
wayland_popup->received_reposition_token = 0;
|
||||
wayland_popup->reposition_token = 0;
|
||||
|
||||
gdk_popup_layout_get_shadow_width (layout,
|
||||
&impl->shadow_left,
|
||||
&impl->shadow_right,
|
||||
|
Loading…
Reference in New Issue
Block a user