diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2018-06-04 18:46:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 18:46:58 -0400 |
| commit | a57d1baf57e86201c89c2e43c7cc0b0269f1b5d3 (patch) | |
| tree | f0f001916bd3a9736f26b83ca06620b7a9d15f8a | |
| parent | 344374fa146b0684ff863f3f3d980cc616eb2e39 (diff) | |
| parent | 516c864d46e105fcf9b3de8109bd2fdc7bba6a1a (diff) | |
| download | wlroots-a57d1baf57e86201c89c2e43c7cc0b0269f1b5d3.tar.xz | |
Merge pull request #1033 from RyanDwyer/fix-xdg-popups
Fix mistakes in xdg_popup and xdg_popup_v6
| -rw-r--r-- | types/xdg_shell/wlr_xdg_popup.c | 6 | ||||
| -rw-r--r-- | types/xdg_shell_v6/wlr_xdg_popup_v6.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/types/xdg_shell/wlr_xdg_popup.c b/types/xdg_shell/wlr_xdg_popup.c index 9c8b6eb2..e7204def 100644 --- a/types/xdg_shell/wlr_xdg_popup.c +++ b/types/xdg_shell/wlr_xdg_popup.c @@ -416,7 +416,7 @@ static bool xdg_popup_unconstrain_slide(struct wlr_xdg_popup *popup, (popup->positioner.constraint_adjustment & XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_X); - bool slide_y = offset_x && + bool slide_y = offset_y && (popup->positioner.constraint_adjustment & XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_Y); @@ -459,7 +459,7 @@ static bool xdg_popup_unconstrain_resize(struct wlr_xdg_popup *popup, (popup->positioner.constraint_adjustment & XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_RESIZE_X); - bool resize_y = offset_x && + bool resize_y = offset_y && (popup->positioner.constraint_adjustment & XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_RESIZE_Y); @@ -471,7 +471,7 @@ static bool xdg_popup_unconstrain_resize(struct wlr_xdg_popup *popup, } xdg_popup_box_constraints(popup, toplevel_sx_box, - &offset_y, &offset_y); + &offset_x, &offset_y); return !offset_x && !offset_y; } diff --git a/types/xdg_shell_v6/wlr_xdg_popup_v6.c b/types/xdg_shell_v6/wlr_xdg_popup_v6.c index a75201d0..ff66e812 100644 --- a/types/xdg_shell_v6/wlr_xdg_popup_v6.c +++ b/types/xdg_shell_v6/wlr_xdg_popup_v6.c @@ -443,7 +443,7 @@ static bool xdg_popup_v6_unconstrain_slide(struct wlr_xdg_popup_v6 *popup, (popup->positioner.constraint_adjustment & ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_SLIDE_X); - bool slide_y = offset_x && + bool slide_y = offset_y && (popup->positioner.constraint_adjustment & ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_SLIDE_Y); @@ -486,7 +486,7 @@ static bool xdg_popup_v6_unconstrain_resize(struct wlr_xdg_popup_v6 *popup, (popup->positioner.constraint_adjustment & ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_RESIZE_X); - bool resize_y = offset_x && + bool resize_y = offset_y && (popup->positioner.constraint_adjustment & ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_RESIZE_Y); @@ -498,7 +498,7 @@ static bool xdg_popup_v6_unconstrain_resize(struct wlr_xdg_popup_v6 *popup, } xdg_popup_v6_box_constraints(popup, toplevel_sx_box, - &offset_y, &offset_y); + &offset_x, &offset_y); return !offset_x && !offset_y; } |