Fix containers not being resized when entering scratchpad

This fixes a regression introduced by
662466e8db. 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.
master
Ryan Dwyer 6 years ago
parent 41f744c224
commit f7aed5c7e5

@ -59,13 +59,13 @@ void root_scratchpad_add_container(struct sway_container *con) {
if (!sway_assert(!con->scratchpad, "Container is already in scratchpad")) { if (!sway_assert(!con->scratchpad, "Container is already in scratchpad")) {
return; return;
} }
con->scratchpad = true;
list_add(root->scratchpad, con);
struct sway_container *parent = con->parent; struct sway_container *parent = con->parent;
struct sway_workspace *workspace = con->workspace; struct sway_workspace *workspace = con->workspace;
container_set_floating(con, true); container_set_floating(con, true);
container_detach(con); container_detach(con);
con->scratchpad = true;
list_add(root->scratchpad, con);
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();
if (parent) { if (parent) {

Loading…
Cancel
Save