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

Merge pull request #1033 from RyanDwyer/fix-xdg-popups 

Fix mistakes in xdg_popup and xdg_popup_v6
This commit is contained in:
Tony Crisci 2018-06-04 18:46:58 -04:00 committed by GitHub
parent 344374fa14 516c864d46
commit a57d1baf57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
types/xdg_shell/wlr_xdg_popup.c
View File

@ -416,7 +416,7 @@ static bool xdg_popup_unconstrain_slide(struct wlr_xdg_popup *popup,
(popup->positioner.constraint_adjustment & (popup->positioner.constraint_adjustment &
XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_X); XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_X);
bool slide_y = offset_x && bool slide_y = offset_y &&
(popup->positioner.constraint_adjustment & (popup->positioner.constraint_adjustment &
XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_Y); 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 & (popup->positioner.constraint_adjustment &
XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_RESIZE_X); XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_RESIZE_X);
bool resize_y = offset_x && bool resize_y = offset_y &&
(popup->positioner.constraint_adjustment & (popup->positioner.constraint_adjustment &
XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_RESIZE_Y); 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, xdg_popup_box_constraints(popup, toplevel_sx_box,
&offset_y, &offset_y); &offset_x, &offset_y);
return !offset_x && !offset_y; return !offset_x && !offset_y;
} }

6
types/xdg_shell_v6/wlr_xdg_popup_v6.c
View File

@ -443,7 +443,7 @@ static bool xdg_popup_v6_unconstrain_slide(struct wlr_xdg_popup_v6 *popup,
(popup->positioner.constraint_adjustment & (popup->positioner.constraint_adjustment &
ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_SLIDE_X); ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_SLIDE_X);
bool slide_y = offset_x && bool slide_y = offset_y &&
(popup->positioner.constraint_adjustment & (popup->positioner.constraint_adjustment &
ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_SLIDE_Y); 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 & (popup->positioner.constraint_adjustment &
ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_RESIZE_X); ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_RESIZE_X);
bool resize_y = offset_x && bool resize_y = offset_y &&
(popup->positioner.constraint_adjustment & (popup->positioner.constraint_adjustment &
ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_RESIZE_Y); 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, xdg_popup_v6_box_constraints(popup, toplevel_sx_box,
&offset_y, &offset_y); &offset_x, &offset_y);
return !offset_x && !offset_y; return !offset_x && !offset_y;
} }