diff options
| author |  emersion <contact@emersion.fr> | 2019-03-06 10:47:50 +0100 |
|---|---|---|
| committer |  Brian Ashworth <bosrsf04@gmail.com> | 2019-03-06 11:50:23 -0500 |
| commit | 8b6bd106aa92192e9e2aa6781e9b2e51f1e22fe2 (patch) | |
| tree | 904b632a84d1614a74c5d6a7ffaa3399ae05d032 /sway/tree/container.c | |
| parent | ipc: change {,deco_}rect to match i3 (diff) | |
| download | sway-8b6bd106aa92192e9e2aa6781e9b2e51f1e22fe2.tar.gz sway-8b6bd106aa92192e9e2aa6781e9b2e51f1e22fe2.tar.zst sway-8b6bd106aa92192e9e2aa6781e9b2e51f1e22fe2.zip | |
Fix container_parent_layout for scratchpad windows
Diffstat (limited to 'sway/tree/container.c')
| -rw-r--r-- | sway/tree/container.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 33043941..a6142193 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
| @@ -1163,7 +1163,10 @@ enum sway_container_layout container_parent_layout(struct sway_container *con) { | |||
| 1163 | if (con->parent) { | 1163 | if (con->parent) { |
| 1164 | return con->parent->layout; | 1164 | return con->parent->layout; |
| 1165 | } | 1165 | } |
| 1166 | return con->workspace->layout; | 1166 | if (con->workspace) { |
| 1167 | return con->workspace->layout; | ||
| 1168 | } | ||
| 1169 | return L_NONE; | ||
| 1167 | } | 1170 | } |
| 1168 | 1171 | ||
| 1169 | enum sway_container_layout container_current_parent_layout( | 1172 | enum sway_container_layout container_current_parent_layout( |