From c99d156f0d626e637cefd4e2bf6f04af648fd873 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 21 Feb 2020 22:22:28 -0800 Subject: [PATCH] xdg-shell: fix popups rendered outside of the screen Leave positioner inverted on the individual axis if it's no longer constrained. Otherwise constraint adjustment like `slide_x & flip_y` could render popup outside of the screen when both axes are constrained. Fixes Alexays/Waybar#532 --- types/xdg_shell/wlr_xdg_popup.c | 4 ++-- types/xdg_shell_v6/wlr_xdg_popup_v6.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/types/xdg_shell/wlr_xdg_popup.c b/types/xdg_shell/wlr_xdg_popup.c index fd608a951..3239ea19a 100644 --- a/types/xdg_shell/wlr_xdg_popup.c +++ b/types/xdg_shell/wlr_xdg_popup.c @@ -454,10 +454,10 @@ static bool xdg_popup_unconstrain_flip(struct wlr_xdg_popup *popup, } // revert the positioner back if it didn't fix it and go to the next part - if (flip_x) { + if (offset_x && flip_x) { wlr_positioner_invert_x(&popup->positioner); } - if (flip_y) { + if (offset_y && flip_y) { wlr_positioner_invert_y(&popup->positioner); } diff --git a/types/xdg_shell_v6/wlr_xdg_popup_v6.c b/types/xdg_shell_v6/wlr_xdg_popup_v6.c index 7d3e06fc9..54c583bd0 100644 --- a/types/xdg_shell_v6/wlr_xdg_popup_v6.c +++ b/types/xdg_shell_v6/wlr_xdg_popup_v6.c @@ -474,10 +474,10 @@ static bool xdg_popup_v6_unconstrain_flip(struct wlr_xdg_popup_v6 *popup, } // revert the positioner back if it didn't fix it and go to the next part - if (flip_x) { + if (offset_x && flip_x) { wlr_positioner_v6_invert_x(&popup->positioner); } - if (flip_y) { + if (offset_y && flip_y) { wlr_positioner_v6_invert_y(&popup->positioner); }