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

Merge pull request #2106 from RedSoxFan/fix-2105

Browse source 
Fix movement crashes/issues
This commit is contained in:
emersion 2018-06-05 08:44:16 +01:00 committed by GitHub
parent 0549fd027b 9aaac8b8c8
commit e410757fe8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sway/tree/layout.c
View file

@ -412,19 +412,15 @@ void container_move(struct sway_container *container,
} }
case C_WORKSPACE: case C_WORKSPACE:
if (!is_parallel(current->layout, move_dir)) { if (!is_parallel(current->layout, move_dir)) {
if (current->children->length > 2) { if (current->children->length >= 2) {
wlr_log(L_DEBUG, "Rejiggering the workspace (%d kiddos)", wlr_log(L_DEBUG, "Rejiggering the workspace (%d kiddos)",
current->children->length); current->children->length);
workspace_rejigger(current, container, move_dir); workspace_rejigger(current, container, move_dir);
} else if (current->children->length == 2) { return;
wlr_log(L_DEBUG, "Changing workspace layout"); } else {
current->layout = wlr_log(L_DEBUG, "Selecting output");
move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? current = current->parent;
L_HORIZ : L_VERT;
container_insert_child(current, container, offs < 0 ? 0 : 1);
arrange_workspace(current);
} }
return;
} else if (current->layout == L_TABBED } else if (current->layout == L_TABBED
|| current->layout == L_STACKED) { || current->layout == L_STACKED) {
wlr_log(L_DEBUG, "Rejiggering out of tabs/stacks"); wlr_log(L_DEBUG, "Rejiggering out of tabs/stacks");
@ -520,7 +516,7 @@ void container_move(struct sway_container *container,
wlr_log(L_DEBUG, "Reparenting container (perpendicular)"); wlr_log(L_DEBUG, "Reparenting container (perpendicular)");
struct sway_container *focus_inactive = seat_get_focus_inactive( struct sway_container *focus_inactive = seat_get_focus_inactive(
config->handler_context.seat, sibling); config->handler_context.seat, sibling);
if (focus_inactive) { if (focus_inactive && focus_inactive != sibling) {
while (focus_inactive->parent != sibling) { while (focus_inactive->parent != sibling) {
focus_inactive = focus_inactive->parent; focus_inactive = focus_inactive->parent;
} }