Merge branch 'dnd-popup' into 'master'

data-device: fix dnd handling during popup interactions

See merge request wlroots/wlroots!4943
This commit is contained in:
YaNing Lu 2026-03-31 16:32:57 +00:00
commit 193983cd4f
2 changed files with 67 additions and 2 deletions

View file

@ -4,6 +4,7 @@
#include <time.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_data_device.h>
#include <wlr/util/log.h>
#include "types/wlr_seat.h"
@ -416,6 +417,11 @@ void wlr_seat_pointer_start_grab(struct wlr_seat *wlr_seat,
grab->seat = wlr_seat;
wlr_seat->pointer_state.grab = grab;
// Preserve drag grab priority
if (wlr_seat->drag && grab != &wlr_seat->drag->pointer_grab) {
return;
}
wl_signal_emit_mutable(&wlr_seat->events.pointer_grab_begin, grab);
}