sway

commit 5f9be1e1aaeaa58879d5979ced4bc29f90c6024a
parent dbaafdfac9057f718be406e972ba15651130e16e
Author: emersion <contact@emersion.fr>
Date:   Thu, 13 Sep 2018 09:38:28 +0200

Merge pull request #2628 from RyanDwyer/remove-rejigger-assertion

Remove bad assertion in workspace_rejigger
Diffstat:
M
sway/commands/move.c
 | 
4
+---

1 file changed, 1 insertion(+), 3 deletions(-)
diff --git 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,