diff options
| author | Ryan Dwyer <[email protected]> | 2018-06-30 22:46:25 +1000 |
|---|---|---|
| committer | Ryan Dwyer <[email protected]> | 2018-06-30 22:46:25 +1000 |
| commit | e396af853b01438f7e5ef34bfa6fd2507d11ce5a (patch) | |
| tree | 323739dc80680dd774acfdcf43eb76cfe93aa64c /sway/tree/container.c | |
| parent | fc6fde7d90ee031539252cb8832e11c38cfed686 (diff) | |
| parent | 9ba72433b6c87086f2772405e09e8ac8c0136a01 (diff) | |
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'sway/tree/container.c')
| -rw-r--r-- | sway/tree/container.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index ab3d9dbd..6f6137c4 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -522,21 +522,11 @@ static struct sway_container *container_at_view(struct sway_container *swayc, view_sx, view_sy, &_sx, &_sy); break; case SWAY_VIEW_XDG_SHELL_V6: - // the top left corner of the sway container is the - // coordinate of the top left corner of the window geometry - view_sx += sview->wlr_xdg_surface_v6->geometry.x; - view_sy += sview->wlr_xdg_surface_v6->geometry.y; - _surface = wlr_xdg_surface_v6_surface_at( sview->wlr_xdg_surface_v6, view_sx, view_sy, &_sx, &_sy); break; case SWAY_VIEW_XDG_SHELL: - // the top left corner of the sway container is the - // coordinate of the top left corner of the window geometry - view_sx += sview->wlr_xdg_surface->geometry.x; - view_sy += sview->wlr_xdg_surface->geometry.y; - _surface = wlr_xdg_surface_surface_at( sview->wlr_xdg_surface, view_sx, view_sy, &_sx, &_sy); @@ -954,6 +944,9 @@ void container_set_floating(struct sway_container *container, bool enable) { container_add_child(workspace, container); container->width = container->parent->width; container->height = container->parent->height; + if (container->type == C_VIEW) { + view_set_tiled(container->sway_view, true); + } container->is_sticky = false; container_reap_empty_recursive(workspace->sway_workspace->floating); } |