aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-10-25 10:13:32 +0200
committerGitHub <noreply@github.com>2018-10-25 10:13:32 +0200
commitdf64cb2827a20aad75a58f8ddd8d5ab85b61b1a1 (patch)
treef3b298b83fb91476303f28bd023d33d1f47a96ed
parent41f744c224eb07990c2b202fde14d93c2474f343 (diff)
parentf7aed5c7e596bc2f03426d6a91214123000d7ed7 (diff)
Merge pull request #2970 from RyanDwyer/fix-scratchpad-size
Fix containers not being resized when entering scratchpad
-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) {
if (!sway_assert(!con->scratchpad, "Container is already in scratchpad")) {
return;
}
- con->scratchpad = true;
- list_add(root->scratchpad, con);
struct sway_container *parent = con->parent;
struct sway_workspace *workspace = con->workspace;
container_set_floating(con, true);
container_detach(con);
+ con->scratchpad = true;
+ list_add(root->scratchpad, con);
struct sway_seat *seat = input_manager_current_seat();
if (parent) {