diff options
| author | emersion <contact@emersion.fr> | 2018-09-13 09:38:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-13 09:38:28 +0200 |
| commit | 5f9be1e1aaeaa58879d5979ced4bc29f90c6024a (patch) | |
| tree | 35a5e437cd6ff2bb7404dee2a8bd8b7527cc0294 /sway/commands/move.c | |
| parent | dbaafdfac9057f718be406e972ba15651130e16e (diff) | |
| parent | 2f6935e00f67c8cd81119504437ddf8e789f6eb3 (diff) | |
Merge pull request #2628 from RyanDwyer/remove-rejigger-assertion
Remove bad assertion in workspace_rejigger
Diffstat (limited to 'sway/commands/move.c')
| -rw-r--r-- | sway/commands/move.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index cd970983..8f0ef230 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -259,9 +259,6 @@ static void container_move_to_container(struct sway_container *container, * In other words, rejigger it. */ static void workspace_rejigger(struct sway_workspace *ws, struct sway_container *child, enum movement_direction move_dir) { - if (!sway_assert(child->parent == NULL, "Expected a root child")) { - return; - } container_detach(child); workspace_wrap_children(ws); @@ -270,6 +267,7 @@ static void workspace_rejigger(struct sway_workspace *ws, ws->layout = move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT; workspace_update_representation(ws); + child->width = child->height = 0; } static void move_out_of_tabs_stacks(struct sway_container *container, |