aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/root.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-25 17:32:16 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-25 17:32:16 +1000
commitf7aed5c7e596bc2f03426d6a91214123000d7ed7 (patch)
treef3b298b83fb91476303f28bd023d33d1f47a96ed /sway/tree/root.c
parentMerge pull request #2925 from ianyfan/swaylock (diff)
downloadsway-f7aed5c7e596bc2f03426d6a91214123000d7ed7.tar.gz
sway-f7aed5c7e596bc2f03426d6a91214123000d7ed7.tar.zst
sway-f7aed5c7e596bc2f03426d6a91214123000d7ed7.zip
Fix containers not being resized when entering scratchpad
This fixes a regression introduced by 662466e8db773926bf61b21280194a3540ae26ec. When adding a container to the scratchpad, setting container->scratchpad = true before container_set_floating made container_set_floating believe that the container was already floating. This fixes it by setting the property afterwards instead.
Diffstat (limited to 'sway/tree/root.c')
-rw-r--r--sway/tree/root.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/tree/root.c b/sway/tree/root.c
index e5eb8f2a..9bda7c28 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -59,13 +59,13 @@ void root_scratchpad_add_container(struct sway_container *con) {
59 if (!sway_assert(!con->scratchpad, "Container is already in scratchpad")) { 59 if (!sway_assert(!con->scratchpad, "Container is already in scratchpad")) {
60 return; 60 return;
61 } 61 }
62 con->scratchpad = true;
63 list_add(root->scratchpad, con);
64 62
65 struct sway_container *parent = con->parent; 63 struct sway_container *parent = con->parent;
66 struct sway_workspace *workspace = con->workspace; 64 struct sway_workspace *workspace = con->workspace;
67 container_set_floating(con, true); 65 container_set_floating(con, true);
68 container_detach(con); 66 container_detach(con);
67 con->scratchpad = true;
68 list_add(root->scratchpad, con);
69 69
70 struct sway_seat *seat = input_manager_current_seat(); 70 struct sway_seat *seat = input_manager_current_seat();
71 if (parent) { 71 if (parent) {