blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wlr_drag: emit destroy after wl_data_device.leave

This commit is contained in:
Isaac Freund 2021-11-22 22:43:39 +01:00
parent 3b93da70a0
commit c9ba9e82b6
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
types/data_device/wlr_drag.c
View File

@ -138,9 +138,6 @@ static void drag_destroy(struct wlr_drag *drag) {
}
}
// We issue destroy after ending the grab to allow focus changes.
wlr_signal_emit_safe(&drag->events.destroy, drag);
if (drag->started) {
drag_set_focus(drag, NULL, 0, 0);
@ -148,6 +145,13 @@ static void drag_destroy(struct wlr_drag *drag) {
drag->seat->drag = NULL;
}
// We issue destroy after ending the grab to allow focus changes.
// Furthermore, we wait until after clearing the drag focus in order
// to ensure that the wl_data_device.leave is sent before emitting the
// signal. This allows e.g. wl_pointer.enter to be sent in the destroy
// signal handler.
wlr_signal_emit_safe(&drag->events.destroy, drag);
if (drag->source) {
wl_list_remove(&drag->source_destroy.link);
}