diff options
| author | Ryan Dwyer <[email protected]> | 2018-08-25 13:06:04 +1000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-08-25 13:06:04 +1000 |
| commit | 4b9ad9c2382db9b2a9a224e9ebc60b6298843aa9 (patch) | |
| tree | f1ed7e866d4e34f5ef9b8f72ec8095369619aaa7 /sway/tree/arrange.c | |
| parent | f51b9478f28143a4f1887711497ff131f26ab1c4 (diff) | |
| parent | e86d99acd655815781cd2e23877ce58ab5b24826 (diff) | |
Merge branch 'master' into commands
Diffstat (limited to 'sway/tree/arrange.c')
| -rw-r--r-- | sway/tree/arrange.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c index cf4a5d9a..a4b058f3 100644 --- a/sway/tree/arrange.c +++ b/sway/tree/arrange.c @@ -206,10 +206,30 @@ static void arrange_workspace(struct sway_container *workspace) { wlr_log(WLR_DEBUG, "Usable area for ws: %dx%d@%d,%d", area->width, area->height, area->x, area->y); remove_gaps(workspace); + + double prev_x = workspace->x; + double prev_y = workspace->y; workspace->width = area->width; workspace->height = area->height; workspace->x = output->x + area->x; workspace->y = output->y + area->y; + + // Adjust any floating containers + double diff_x = workspace->x - prev_x; + double diff_y = workspace->y - prev_y; + for (int i = 0; i < workspace->sway_workspace->floating->length; ++i) { + struct sway_container *floater = + workspace->sway_workspace->floating->items[i]; + container_floating_translate(floater, diff_x, diff_y); + double center_x = floater->x + floater->width / 2; + double center_y = floater->y + floater->height / 2; + struct wlr_box workspace_box; + container_get_box(workspace, &workspace_box); + if (!wlr_box_contains_point(&workspace_box, center_x, center_y)) { + container_floating_move_to_center(floater); + } + } + add_gaps(workspace); container_set_dirty(workspace); wlr_log(WLR_DEBUG, "Arranging workspace '%s' at %f, %f", workspace->name, |