Merge pull request #860 from emersion/fix-xdg-popup-at

Fix wlr_xdg_surface_surface_at for popups

types/wlr_xdg_shell.c

@@ -1644,8 +1644,8 @@ struct wlr_surface *wlr_xdg_surface_surface_at(
 		wlr_xdg_surface_popup_get_position(popup, &popup_sx, &popup_sy);
 
 		struct wlr_surface *sub = wlr_xdg_surface_surface_at(popup,
-			sx - popup_sx + popup->geometry.x,
+			sx - popup_sx,
-			sy - popup_sy + popup->geometry.y,
+			sy - popup_sy,
 			sub_x, sub_y);
 		if (sub != NULL) {
 			return sub;

types/wlr_xdg_shell_v6.c

@@ -1608,8 +1608,8 @@ struct wlr_surface *wlr_xdg_surface_v6_surface_at(
 		wlr_xdg_surface_v6_popup_get_position(popup, &popup_sx, &popup_sy);
 
 		struct wlr_surface *sub = wlr_xdg_surface_v6_surface_at(popup,
-			sx - popup_sx + popup->geometry.x,
+			sx - popup_sx,
-			sy - popup_sy + popup->geometry.y,
+			sy - popup_sy,
 			sub_x, sub_y);
 		if (sub != NULL) {
 			return sub;