diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-08-18 19:26:36 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-18 19:26:36 -0400 |
commit | d0a24465d75cc7197ee253e1de9fa961071cd034 (patch) | |
tree | 916f9f40b9f587d3cd24a8d7b2185b5c7808cfa4 /sway/tree/container.c | |
parent | Merge pull request #2484 from ianyfan/con-for-each-child-fix (diff) | |
parent | Fix nitpick (diff) | |
download | sway-d0a24465d75cc7197ee253e1de9fa961071cd034.tar.gz sway-d0a24465d75cc7197ee253e1de9fa961071cd034.tar.zst sway-d0a24465d75cc7197ee253e1de9fa961071cd034.zip |
Merge pull request #2466 from RyanDwyer/geometry
Fix geometry
Diffstat (limited to 'sway/tree/container.c')
-rw-r--r-- | sway/tree/container.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 9bc4f544..2a428ca5 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -509,8 +509,8 @@ static void surface_at_view(struct sway_container *swayc, double lx, double ly, | |||
509 | return; | 509 | return; |
510 | } | 510 | } |
511 | struct sway_view *sview = swayc->sway_view; | 511 | struct sway_view *sview = swayc->sway_view; |
512 | double view_sx = lx - sview->x; | 512 | double view_sx = lx - sview->x + sview->geometry.x; |
513 | double view_sy = ly - sview->y; | 513 | double view_sy = ly - sview->y + sview->geometry.y; |
514 | 514 | ||
515 | double _sx, _sy; | 515 | double _sx, _sy; |
516 | struct wlr_surface *_surface = NULL; | 516 | struct wlr_surface *_surface = NULL; |
@@ -1065,6 +1065,7 @@ void container_set_geometry_from_floating_view(struct sway_container *con) { | |||
1065 | con->y = view->y - top; | 1065 | con->y = view->y - top; |
1066 | con->width = view->width + border_width * 2; | 1066 | con->width = view->width + border_width * 2; |
1067 | con->height = top + view->height + border_width; | 1067 | con->height = top + view->height + border_width; |
1068 | container_set_dirty(con); | ||
1068 | } | 1069 | } |
1069 | 1070 | ||
1070 | bool container_is_floating(struct sway_container *container) { | 1071 | bool container_is_floating(struct sway_container *container) { |