alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source 
Remove bad assertion in workspace_rejigger
This commit is contained in:
emersion 2018-09-13 09:38:28 +02:00 committed by GitHub
parent dbaafdfac9 2f6935e00f
commit 5f9be1e1aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/commands/move.c
View file

@ -259,9 +259,6 @@ static void container_move_to_container(struct sway_container *container,
* In other words, rejigger it. */ * In other words, rejigger it. */
static void workspace_rejigger(struct sway_workspace *ws, static void workspace_rejigger(struct sway_workspace *ws,
struct sway_container *child, enum movement_direction move_dir) { struct sway_container *child, enum movement_direction move_dir) {
if (!sway_assert(child->parent == NULL, "Expected a root child")) {
return;
}
container_detach(child); container_detach(child);
workspace_wrap_children(ws); workspace_wrap_children(ws);
@ -270,6 +267,7 @@ static void workspace_rejigger(struct sway_workspace *ws,
ws->layout = ws->layout =
move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT; move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT;
workspace_update_representation(ws); workspace_update_representation(ws);
child->width = child->height = 0;
} }
static void move_out_of_tabs_stacks(struct sway_container *container, static void move_out_of_tabs_stacks(struct sway_container *container,