blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Aleksei Bavshin 2020-02-21 22:22:28 -08:00 committed by Simon Ser
parent 3ff6a5def3
commit c99d156f0d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
types/xdg_shell/wlr_xdg_popup.c
View File

@ -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 // 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); wlr_positioner_invert_x(&popup->positioner);
} }
if (flip_y) { if (offset_y && flip_y) {
wlr_positioner_invert_y(&popup->positioner); wlr_positioner_invert_y(&popup->positioner);
} }

4
types/xdg_shell_v6/wlr_xdg_popup_v6.c
View File

@ -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 // 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); wlr_positioner_v6_invert_x(&popup->positioner);
} }
if (flip_y) { if (offset_y && flip_y) {
wlr_positioner_v6_invert_y(&popup->positioner); wlr_positioner_v6_invert_y(&popup->positioner);
} }