diff options
| author |  Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2016-04-01 15:58:29 +0200 |
|---|---|---|
| committer | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2016-04-25 00:00:49 +0200 |
| commit | d26658fb355fdf7feee2d6aa801e487502e6ce8b (patch) | |
| tree | 1879cf81d8e55b676bbd4a5b44dd23d5d93e8b5f /sway/container.c | |
| parent | Fix problems with floating windows (diff) | |
| download | sway-d26658fb355fdf7feee2d6aa801e487502e6ce8b.tar.gz sway-d26658fb355fdf7feee2d6aa801e487502e6ce8b.tar.zst sway-d26658fb355fdf7feee2d6aa801e487502e6ce8b.zip | |
Correctly determine default layout
Diffstat (limited to 'sway/container.c')
| -rw-r--r-- | sway/container.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sway/container.c b/sway/container.c index 2b100f40..5579fddb 100644 --- a/sway/container.c +++ b/sway/container.c | |||
| @@ -163,16 +163,8 @@ swayc_t *new_workspace(swayc_t *output, const char *name) { | |||
| 163 | sway_log(L_DEBUG, "Added workspace %s for output %u", name, (unsigned int)output->handle); | 163 | sway_log(L_DEBUG, "Added workspace %s for output %u", name, (unsigned int)output->handle); |
| 164 | swayc_t *workspace = new_swayc(C_WORKSPACE); | 164 | swayc_t *workspace = new_swayc(C_WORKSPACE); |
| 165 | 165 | ||
| 166 | // TODO: default_layout | 166 | workspace->layout = default_layout(output); |
| 167 | if (config->default_layout != L_NONE) { | 167 | |
| 168 | workspace->layout = config->default_layout; | ||
| 169 | } else if (config->default_orientation != L_NONE) { | ||
| 170 | workspace->layout = config->default_orientation; | ||
| 171 | } else if (output->width >= output->height) { | ||
| 172 | workspace->layout = L_HORIZ; | ||
| 173 | } else { | ||
| 174 | workspace->layout = L_VERT; | ||
| 175 | } | ||
| 176 | workspace->x = output->x; | 168 | workspace->x = output->x; |
| 177 | workspace->y = output->y; | 169 | workspace->y = output->y; |
| 178 | workspace->width = output->width; | 170 | workspace->width = output->width; |