Merge branch 'master' of git://github.com/SirCmpwn/sway into fix-swaybar-take-2

This commit is contained in:
Zandr Martin 2016-07-22 07:25:52 -05:00
commit be70f60e36
No known key found for this signature in database
GPG key ID: AA2BB8EF77F7BBDC

View file

@ -576,7 +576,7 @@ void update_geometry(swayc_t *container) {
border_left = 0;
}
if (geometry.origin.x + geometry.size.w == workspace->width) {
if (geometry.origin.x + geometry.size.w == workspace->x + workspace->width) {
border_right = 0;
}
}
@ -586,7 +586,7 @@ void update_geometry(swayc_t *container) {
border_top = 0;
}
if (geometry.origin.y + geometry.size.h == workspace->height) {
if (geometry.origin.y + geometry.size.h == workspace->y + workspace->height) {
border_bottom = 0;
}
}