From c9d2a5bee2acde40f45c1f07558e62550e1c4dc3 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 12 Apr 2014 00:29:16 -0700 Subject: [PATCH] pointer: Don't use default_grab_focus in popup grabs default_grab_focus tries to add implicit grab semantics where focus won't take effect if there's a pointer button down. This is not what we want for popup grabs at all, as it's perfectly valid to want to drag on a menu while there's a button down. --- src/wayland/meta-wayland-pointer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c index 9e423a4e6..4cc349210 100644 --- a/src/wayland/meta-wayland-pointer.c +++ b/src/wayland/meta-wayland-pointer.c @@ -421,7 +421,7 @@ popup_grab_focus (MetaWaylandPointerGrab *grab, /* Popup grabs are in owner-events mode (ie, events for the same client are reported as normal) */ if (surface && wl_resource_get_client (surface->resource) == popup_grab->grab_client) - default_grab_focus (grab, surface); + meta_wayland_pointer_set_focus (grab->pointer, surface); else meta_wayland_pointer_set_focus (grab->pointer, NULL); }