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 | |
parent | Merge pull request #2622 from ianyfan/i3bar-block-ref (diff) | |
parent | Remove bad assertion in workspace_rejigger (diff) | |
download | sway-5f9be1e1aaeaa58879d5979ced4bc29f90c6024a.tar.gz sway-5f9be1e1aaeaa58879d5979ced4bc29f90c6024a.tar.zst sway-5f9be1e1aaeaa58879d5979ced4bc29f90c6024a.zip |
Merge pull request #2628 from RyanDwyer/remove-rejigger-assertion
Remove bad assertion in workspace_rejigger
-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, | |||
259 | * In other words, rejigger it. */ | 259 | * In other words, rejigger it. */ |
260 | static void workspace_rejigger(struct sway_workspace *ws, | 260 | static void workspace_rejigger(struct sway_workspace *ws, |
261 | struct sway_container *child, enum movement_direction move_dir) { | 261 | struct sway_container *child, enum movement_direction move_dir) { |
262 | if (!sway_assert(child->parent == NULL, "Expected a root child")) { | ||
263 | return; | ||
264 | } | ||
265 | container_detach(child); | 262 | container_detach(child); |
266 | workspace_wrap_children(ws); | 263 | workspace_wrap_children(ws); |
267 | 264 | ||
@@ -270,6 +267,7 @@ static void workspace_rejigger(struct sway_workspace *ws, | |||
270 | ws->layout = | 267 | ws->layout = |
271 | move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT; | 268 | move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT; |
272 | workspace_update_representation(ws); | 269 | workspace_update_representation(ws); |
270 | child->width = child->height = 0; | ||
273 | } | 271 | } |
274 | 272 | ||
275 | static void move_out_of_tabs_stacks(struct sway_container *container, | 273 | static void move_out_of_tabs_stacks(struct sway_container *container, |