Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/wayland-fix-popup-grabs' into 'master'

Browse Source 
Fix Wayland popup grabs

See merge request GNOME/gtk!1463
This commit is contained in:
Matthias Clasen
2020-02-22 20:51:32 +00:00
parent b8db9e124b f0b0076a1c
commit 7edfcc37a3
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdk/wayland/gdksurface-wayland.c
View File

@@ -2691,12 +2691,6 @@ gdk_wayland_surface_map_popup (GdkSurface *surface,
GdkSurface *parent;
GdkWaylandSeat *grab_input_seat;
if (!should_be_mapped (surface))
return;
if (impl->mapped)
return;
parent = surface->parent;
if (!parent)
{
@@ -2719,6 +2713,8 @@ gdk_wayland_surface_map_popup (GdkSurface *surface,
impl->popup.unconstrained_width = width;
impl->popup.unconstrained_height = height;
impl->mapped = TRUE;
gdk_synthesize_surface_state (surface, GDK_SURFACE_STATE_WITHDRAWN, 0);
}
static void
@@ -2836,7 +2832,6 @@ gdk_wayland_surface_present_popup (GdkSurface *surface,
if (impl->display_server.xdg_popup)
{
gdk_synthesize_surface_state (surface, GDK_SURFACE_STATE_WITHDRAWN, 0);
gdk_surface_invalidate_rect (surface, NULL);
return TRUE;
}