From 82c92177ff3d366851e460eed428a51462b0debb Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Mon, 2 Sep 2019 13:50:39 +0200 Subject: [PATCH] wayland/data-device: Do not unset focus on drag start On drag start, `data_device_start_drag()` issues a keyboard grab, which in turn will unset the current input focus. There is not need to unset the input focus in `data_device_start_drag()` as this is redone in `meta_wayland_keyboard_start_grab()` https://gitlab.gnome.org/GNOME/mutter/issues/747 --- src/wayland/meta-wayland-data-device.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c index 7eeac7e31..16fec6437 100644 --- a/src/wayland/meta-wayland-data-device.c +++ b/src/wayland/meta-wayland-data-device.c @@ -1315,11 +1315,8 @@ data_device_start_drag (struct wl_client *client, surface, drag_source, icon_surface); if (meta_wayland_seat_has_keyboard (seat)) - { - meta_wayland_keyboard_set_focus (seat->keyboard, NULL); - meta_wayland_keyboard_start_grab (seat->keyboard, - &seat->data_device.current_grab->keyboard_grab); - } + meta_wayland_keyboard_start_grab (seat->keyboard, + &seat->data_device.current_grab->keyboard_grab); } static void