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

xdg_shell: remove variable self-assignment

This commit is contained in:
Antonin Décimo 2019-08-09 15:29:33 +02:00 committed by Drew DeVault
parent 8f3d73e3a3
commit 0695324de7
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
types/xdg_shell/wlr_xdg_positioner.c
View File

@ -222,20 +222,16 @@ struct wlr_box wlr_xdg_positioner_get_geometry(
if (positioner_gravity_has_edge(positioner->gravity, if (positioner_gravity_has_edge(positioner->gravity,
XDG_POSITIONER_GRAVITY_TOP)) { XDG_POSITIONER_GRAVITY_TOP)) {
geometry.y -= geometry.height; geometry.y -= geometry.height;
} else if (positioner_gravity_has_edge(positioner->gravity, } else if (!positioner_gravity_has_edge(positioner->gravity,
XDG_POSITIONER_GRAVITY_BOTTOM)) { XDG_POSITIONER_GRAVITY_BOTTOM)) {
geometry.y = geometry.y;
} else {
geometry.y -= geometry.height / 2; geometry.y -= geometry.height / 2;
} }
if (positioner_gravity_has_edge(positioner->gravity, if (positioner_gravity_has_edge(positioner->gravity,
XDG_POSITIONER_GRAVITY_LEFT)) { XDG_POSITIONER_GRAVITY_LEFT)) {
geometry.x -= geometry.width; geometry.x -= geometry.width;
} else if (positioner_gravity_has_edge(positioner->gravity, } else if (!positioner_gravity_has_edge(positioner->gravity,
XDG_POSITIONER_GRAVITY_RIGHT)) { XDG_POSITIONER_GRAVITY_RIGHT)) {
geometry.x = geometry.x;
} else {
geometry.x -= geometry.width / 2; geometry.x -= geometry.width / 2;
} }

8
types/xdg_shell_v6/wlr_xdg_positioner_v6.c
View File

@ -154,17 +154,13 @@ struct wlr_box wlr_xdg_positioner_v6_get_geometry(
if (positioner->gravity & ZXDG_POSITIONER_V6_GRAVITY_TOP) { if (positioner->gravity & ZXDG_POSITIONER_V6_GRAVITY_TOP) {
geometry.y -= geometry.height; geometry.y -= geometry.height;
} else if (positioner->gravity & ZXDG_POSITIONER_V6_GRAVITY_BOTTOM) { } else if (!(positioner->gravity & ZXDG_POSITIONER_V6_GRAVITY_BOTTOM)) {
geometry.y = geometry.y;
} else {
geometry.y -= geometry.height / 2; geometry.y -= geometry.height / 2;
} }
if (positioner->gravity & ZXDG_POSITIONER_V6_GRAVITY_LEFT) { if (positioner->gravity & ZXDG_POSITIONER_V6_GRAVITY_LEFT) {
geometry.x -= geometry.width; geometry.x -= geometry.width;
} else if (positioner->gravity & ZXDG_POSITIONER_V6_GRAVITY_RIGHT) { } else if (!(positioner->gravity & ZXDG_POSITIONER_V6_GRAVITY_RIGHT)) {
geometry.x = geometry.x;
} else {
geometry.x -= geometry.width / 2; geometry.x -= geometry.width / 2;
} }