aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2019-03-06 10:47:50 +0100
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-03-11 10:56:20 -0400
commit8dfdb3fa112544c52fa86ec46e05c4d0eaab6a92 (patch)
treeff7ea437821c4857fbd51eeda5d0362c01c6919b
parentipc: change {,deco_}rect to match i3 (diff)
downloadsway-8dfdb3fa112544c52fa86ec46e05c4d0eaab6a92.tar.gz
sway-8dfdb3fa112544c52fa86ec46e05c4d0eaab6a92.tar.zst
sway-8dfdb3fa112544c52fa86ec46e05c4d0eaab6a92.zip
Fix container_parent_layout for scratchpad windows
-rw-r--r--sway/tree/container.c5
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
1169enum sway_container_layout container_current_parent_layout( 1172enum sway_container_layout container_current_parent_layout(