Merge pull request #2466 from RyanDwyer/geometry

Fix geometry
This commit is contained in:
Drew DeVault 2018-08-18 19:26:36 -04:00 committed by GitHub
commit d0a24465d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 151 additions and 60 deletions

View file

@ -509,8 +509,8 @@ static void surface_at_view(struct sway_container *swayc, double lx, double ly,
return;
}
struct sway_view *sview = swayc->sway_view;
double view_sx = lx - sview->x;
double view_sy = ly - sview->y;
double view_sx = lx - sview->x + sview->geometry.x;
double view_sy = ly - sview->y + sview->geometry.y;
double _sx, _sy;
struct wlr_surface *_surface = NULL;
@ -1065,6 +1065,7 @@ void container_set_geometry_from_floating_view(struct sway_container *con) {
con->y = view->y - top;
con->width = view->width + border_width * 2;
con->height = top + view->height + border_width;
container_set_dirty(con);
}
bool container_is_floating(struct sway_container *container) {