diff options
| author | emersion <[email protected]> | 2018-08-02 23:49:25 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-08-02 23:49:25 +0100 |
| commit | 3a54e2291c017397ceff60511c29fe70d229bc8b (patch) | |
| tree | d340b7776f945462f5ecffc830ada4d5fbe82f51 /sway/tree/arrange.c | |
| parent | c35a34262f8da368f65d37f811a2264647e0dae6 (diff) | |
| parent | e07da5fc5c6ac5c186662b56b08ca71531119de0 (diff) | |
Merge branch 'master' into wlr-gamma-control
Diffstat (limited to 'sway/tree/arrange.c')
| -rw-r--r-- | sway/tree/arrange.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c index 533cf71c..5452b13c 100644 --- a/sway/tree/arrange.c +++ b/sway/tree/arrange.c @@ -220,8 +220,22 @@ static void arrange_workspace(struct sway_container *workspace) { container_set_dirty(workspace); wlr_log(WLR_DEBUG, "Arranging workspace '%s' at %f, %f", workspace->name, workspace->x, workspace->y); - arrange_floating(workspace->sway_workspace->floating); - arrange_children_of(workspace); + if (workspace->sway_workspace->fullscreen) { + struct sway_container *fs = workspace->sway_workspace->fullscreen; + fs->x = workspace->parent->x; + fs->y = workspace->parent->y; + fs->width = workspace->parent->width; + fs->height = workspace->parent->height; + if (fs->type == C_VIEW) { + view_autoconfigure(fs->sway_view); + } else { + arrange_children_of(fs); + } + container_set_dirty(fs); + } else { + arrange_floating(workspace->sway_workspace->floating); + arrange_children_of(workspace); + } } static void arrange_output(struct sway_container *output) { |