Merge pull request #1232 from nyorain/fix/dnd-offset

Fix #1129

include/wlr/types/wlr_data_device.h

@@ -93,8 +93,6 @@ struct wlr_drag_icon {
 	bool is_pointer;
 	int32_t touch_id;
 
-	int32_t sx, sy;
-
 	struct {
 		struct wl_signal map;
 		struct wl_signal unmap;

rootston/seat.c

@@ -502,16 +502,16 @@ void roots_drag_icon_update_position(struct roots_drag_icon *icon) {
 	struct roots_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->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;
 	}
 
 	roots_drag_icon_damage_whole(icon);

types/data_device/wlr_drag.c

@@ -345,9 +345,6 @@ static void drag_icon_surface_role_commit(struct wlr_surface *surface) {
 		return;
 	}
 
-	icon->sx += icon->surface->current.dx;
-	icon->sy += icon->surface->current.dy;
-
 	drag_icon_set_mapped(icon, wlr_surface_has_buffer(surface));
 }