From fa0be972bb770b11593ba1990393007e39b7e423 Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 12 Apr 2018 17:17:32 -0400 Subject: [PATCH] Fix wlr_xdg_surface_surface_at for popups --- types/wlr_xdg_shell.c | 4 ++-- types/wlr_xdg_shell_v6.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/types/wlr_xdg_shell.c b/types/wlr_xdg_shell.c index d4848e35..1aa964a6 100644 --- a/types/wlr_xdg_shell.c +++ b/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, - sy - popup_sy + popup->geometry.y, + sx - popup_sx, + sy - popup_sy, sub_x, sub_y); if (sub != NULL) { return sub; diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c index f1258f0f..3bd845d3 100644 --- a/types/wlr_xdg_shell_v6.c +++ b/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, - sy - popup_sy + popup->geometry.y, + sx - popup_sx, + sy - popup_sy, sub_x, sub_y); if (sub != NULL) { return sub;