diff options
author | emersion <contact@emersion.fr> | 2018-10-25 10:13:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-25 10:13:32 +0200 |
commit | df64cb2827a20aad75a58f8ddd8d5ab85b61b1a1 (patch) | |
tree | f3b298b83fb91476303f28bd023d33d1f47a96ed /sway | |
parent | Merge pull request #2925 from ianyfan/swaylock (diff) | |
parent | Fix containers not being resized when entering scratchpad (diff) | |
download | sway-df64cb2827a20aad75a58f8ddd8d5ab85b61b1a1.tar.gz sway-df64cb2827a20aad75a58f8ddd8d5ab85b61b1a1.tar.zst sway-df64cb2827a20aad75a58f8ddd8d5ab85b61b1a1.zip |
Merge pull request #2970 from RyanDwyer/fix-scratchpad-size
Fix containers not being resized when entering scratchpad
Diffstat (limited to 'sway')
-rw-r--r-- | sway/tree/root.c | 4 |
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) { |