mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-27 06:59:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2603 from emersion/fix-dnd

Browse source 
Fix drag-and-drop
This commit is contained in:
Drew DeVault 2018-09-07 11:09:02 -04:00 • committed by GitHub
commit 030b5bc024
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sway/input/seat.c
View file

@ -222,16 +222,16 @@ void drag_icon_update_position(struct sway_drag_icon *icon) {
struct sway_seat *seat = icon->seat;
struct wlr_cursor *cursor = seat->cursor->cursor;
if (wlr_icon->is_pointer) {
icon->x = cursor->x + wlr_icon->sx;
icon->y = cursor->y + wlr_icon->sy;
icon->x = cursor->x;
icon->y = cursor->y;
} else {
struct wlr_touch_point *point =
wlr_seat_touch_get_point(seat->wlr_seat, wlr_icon->touch_id);
if (point == NULL) {
return;
}
icon->x = seat->touch_x + wlr_icon->sx;
icon->y = seat->touch_y + wlr_icon->sy;
icon->x = seat->touch_x;
icon->y = seat->touch_y;
}
drag_icon_damage_whole(icon);
@ -289,6 +289,7 @@ static void handle_new_drag_icon(struct wl_listener *listener, void *data) {
wl_list_insert(&root->drag_icons, &icon->link);
drag_icon_update_position(icon);
seat_end_mouse_operation(seat);
}
static void collect_focus_iter(struct sway_node *node, void *data) {